fix: Do not insert initial value when input is empty in editor #8773
+7
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…en-input-is-empty-in-editor
…en-input-is-empty-in-editor
…en-input-is-empty-in-editor
miya
commented
May 21, 2024
| @@ -92,7 +93,9 @@ export const useCollaborativeEditorMode = ( | |||
|
|
|||
| socketIOProvider.on('sync', (isSync: boolean) => { | |||
| if (isSync) { | |||
| socket.emit(GlobalSocketEventName.YDocSync, { pageId, initialValue }); | |||
| // If no draft exists, insert initial value | |||
| socket.emit(GlobalSocketEventName.YDocSync, { pageId, initialValue: hasDraft ? undefined : initialValue }); | |||
There was a problem hiding this comment.
ドラフトが存在しない時に初期値を入れるようにした (ドラフトを空文字にしても初期値が入らない)
| @@ -192,6 +192,10 @@ class SocketIoService { | |||
| }); | |||
|
|
|||
| socket.on(GlobalSocketEventName.YDocSync, async({ pageId, initialValue }) => { | |||
| this.io | |||
| .in(getRoomNameWithId(RoomPrefix.PAGE, pageId)) | |||
| .emit('hasYjsDraft', true); | |||
There was a problem hiding this comment.
Editor を開いたら、ドラフトが生成されたことをクライアントに通知する
|
|
||
| const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.MAIN); | ||
|
|
||
| const [markdownToPreview, setMarkdownToPreview] = useState<string>(codeMirrorEditor?.getDoc() ?? ''); |
There was a problem hiding this comment.
- markdownToPreview の初期値にエディターで入力中の文字列を入れるようにした
- ドラフトが空文字列の時に CodeMirrorEditorMain に渡す onChange がトリガーされたかったためこのような改修を行なった
|
https://redmine.weseek.co.jp/issues/130798 に書いてある前提・背景のためだけにこれだけのコードや追加の store やイベントを追加するのはあまりやりたくないな |
yuki-takei
requested changes
May 21, 2024
| @@ -62,7 +62,7 @@ class YjsConnectionManager { | |||
| const persistedCodeMirrorText = persistedYdoc.getText('codemirror').toString(); | |||
| const currentCodeMirrorText = currentYdoc.getText('codemirror').toString(); | |||
|
|
|||
| if (persistedCodeMirrorText === '' && currentCodeMirrorText === '') { | |||
| if (persistedCodeMirrorText === '' && currentCodeMirrorText === '' && initialValue != null) { | |||
There was a problem hiding this comment.
getYdoc() や getText で得られるインスタンスにはそれなりに多くの情報が入っているように見える。
toString() した結果だけをもって判定しようとするから融通が利かないのでは？
…en-input-is-empty-in-editor
miya
commented
May 23, 2024
| if (persistedCodeMirrorText === '' && currentCodeMirrorText === '') { | ||
| // If no write operation has been performed, insert initial value | ||
| const clientsSize = currentYdoc.store.clients.size; | ||
| if (clientsSize === 0) { |
There was a problem hiding this comment.
Ydoc の初期化後に何らかの操作を行うことにより store.clients.size が増えていく
参考
https://speakerdeck.com/kentomoriwaki/wakatutaqi-ninareru-crdt-woshi-tutagong-tong-bian-ji?slide=22
|
reg-suit detected visual differences. Check this report, and review them. 🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴 🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵🔵 What do the circles mean?The number of circles represent the number of changed images.🔴 : Changed items, ⚪ : New items, ⚫ : Deleted items, and 🔵 Passed items How can I change the check status?If reviewers approve this PR, the reg context status will be green automatically. |
yuki-takei
deleted the
feat/130798-do-not-insert-initial-value-when-input-is-empty-in-editor
branch
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task
#126535 [v7][New Editor][autosave] 明示的なページの保存でオートセーブリビジョンが自動で削除される
┗ #130798 空文字にしたときに initialValue が入らないようにする