Ryan/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2026-08-15 07:21:37 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: placeholder bug (#2373)

Browse Source 
* fix placeholder check

* tiptap v3.29.2

* add s3 max socket env
This commit is contained in:
Philip Okugbe
2026-08-01 11:45:25 +01:00
committed by GitHub
parent 70d2ff8685
commit cd34594b5d
6 changed files with 1214 additions and 1204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/features/editor/extensions/extensions.ts
+4 -2
View File
@@ -194,8 +194,9 @@ export const mainExtensions = [
return i18n.t("Toggle title"); return i18n.t("Toggle title");
} }
if (node.type.name === "paragraph") { if (node.type.name === "paragraph") {
const $pos = editor.state.doc.resolve(pos); const doc = editor.state.doc;
const parentName = $pos.parent.type.name; if (pos >= 0 && pos <= doc.content.size) {
const parentName = doc.resolve(pos).parent.type.name;
if ( if (
parentName === "column" || parentName === "column" ||
parentName === "tableCell" || parentName === "tableCell" ||
@@ -205,6 +206,7 @@ export const mainExtensions = [
) { ) {
return i18n.t("Write..."); return i18n.t("Write...");
} }
}
return i18n.t('Write anything. Enter "/" for commands'); return i18n.t('Write anything. Enter "/" for commands');
} }
}, },
apps/server/src/ee
+1 -1
Submodule apps/server/src/ee updated: 74d68dc5c5...4d86a8857d
apps/server/src/integrations/storage/drivers/s3.driver.ts
+1 -1
View File
@@ -15,7 +15,7 @@ import { getMimeType } from '../../../common/helpers';
import { Upload } from '@aws-sdk/lib-storage'; import { Upload } from '@aws-sdk/lib-storage';
import { Logger } from '@nestjs/common'; import { Logger } from '@nestjs/common';
const S3_MAX_SOCKETS = 200; const S3_MAX_SOCKETS = parseInt(process.env.AWS_S3_MAX_SOCKETS) || 200;
export class S3Driver implements StorageDriver { export class S3Driver implements StorageDriver {
private readonly s3Client: S3Client; private readonly s3Client: S3Client;
package.json
+28 -28
View File
@@ -31,34 +31,34 @@
"@joplin/turndown": "4.0.82", "@joplin/turndown": "4.0.82",
"@joplin/turndown-plugin-gfm": "1.0.64", "@joplin/turndown-plugin-gfm": "1.0.64",
"@sindresorhus/slugify": "3.0.0", "@sindresorhus/slugify": "3.0.0",
"@tiptap/core": "3.28.0", "@tiptap/core": "3.29.2",
"@tiptap/extension-audio": "3.28.0", "@tiptap/extension-audio": "3.29.2",
"@tiptap/extension-code-block": "3.28.0", "@tiptap/extension-code-block": "3.29.2",
"@tiptap/extension-collaboration": "3.28.0", "@tiptap/extension-collaboration": "3.29.2",
"@tiptap/extension-collaboration-caret": "3.28.0", "@tiptap/extension-collaboration-caret": "3.29.2",
"@tiptap/extension-color": "3.28.0", "@tiptap/extension-color": "3.29.2",
"@tiptap/extension-document": "3.28.0", "@tiptap/extension-document": "3.29.2",
"@tiptap/extension-heading": "3.28.0", "@tiptap/extension-heading": "3.29.2",
"@tiptap/extension-highlight": "3.28.0", "@tiptap/extension-highlight": "3.29.2",
"@tiptap/extension-history": "3.28.0", "@tiptap/extension-history": "3.29.2",
"@tiptap/extension-image": "3.28.0", "@tiptap/extension-image": "3.29.2",
"@tiptap/extension-link": "3.28.0", "@tiptap/extension-link": "3.29.2",
"@tiptap/extension-list": "3.28.0", "@tiptap/extension-list": "3.29.2",
"@tiptap/extension-placeholder": "3.28.0", "@tiptap/extension-placeholder": "3.29.2",
"@tiptap/extension-subscript": "3.28.0", "@tiptap/extension-subscript": "3.29.2",
"@tiptap/extension-superscript": "3.28.0", "@tiptap/extension-superscript": "3.29.2",
"@tiptap/extension-table": "3.28.0", "@tiptap/extension-table": "3.29.2",
"@tiptap/extension-text": "3.28.0", "@tiptap/extension-text": "3.29.2",
"@tiptap/extension-text-align": "3.28.0", "@tiptap/extension-text-align": "3.29.2",
"@tiptap/extension-text-style": "3.28.0", "@tiptap/extension-text-style": "3.29.2",
"@tiptap/extension-typography": "3.28.0", "@tiptap/extension-typography": "3.29.2",
"@tiptap/extension-unique-id": "3.28.0", "@tiptap/extension-unique-id": "3.29.2",
"@tiptap/extension-youtube": "3.28.0", "@tiptap/extension-youtube": "3.29.2",
"@tiptap/html": "3.28.0", "@tiptap/html": "3.29.2",
"@tiptap/pm": "3.28.0", "@tiptap/pm": "3.29.2",
"@tiptap/react": "3.28.0", "@tiptap/react": "3.29.2",
"@tiptap/starter-kit": "3.28.0", "@tiptap/starter-kit": "3.29.2",
"@tiptap/suggestion": "3.28.0", "@tiptap/suggestion": "3.29.2",
"@tiptap/y-tiptap": "3.0.7", "@tiptap/y-tiptap": "3.0.7",
"bytes": "3.1.2", "bytes": "3.1.2",
"cross-env": "10.1.0", "cross-env": "10.1.0",
pnpm-lock.yaml
Generated
+1171 -1163
View File
File diff suppressed because it is too large Load Diff
pnpm-workspace.yaml
+1 -1
View File
@@ -54,7 +54,7 @@ overrides:
js-yaml@>=3.0.0 <3.15.0: 3.15.0 js-yaml@>=3.0.0 <3.15.0: 3.15.0
js-yaml@>=4.0.0 <=4.1.1: 4.3.0 js-yaml@>=4.0.0 <=4.1.1: 4.3.0
shamefullyHoist: true shamefullyHoist: true
minimumReleaseAge: 5760 minimumReleaseAge: 4320
allowBuilds: allowBuilds:
'@swc/core': true '@swc/core': true
bcrypt: true bcrypt: true