@sveltia/ui 0.85.1 → 0.85.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/text-editor/lexical-root.svelte +57 -1
- package/dist/components/text-editor/shiki/version.d.ts +1 -1
- package/dist/components/text-editor/shiki/version.js +1 -1
- package/dist/components/text-editor/store.svelte.js +8 -0
- package/dist/components/text-editor/toolbar/text-editor-toolbar.svelte +5 -1
- package/dist/components/text-editor/toolbar/toolbar-wrapper.svelte +3 -0
- package/dist/typedefs.d.ts +6 -0
- package/dist/typedefs.js +3 -0
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<script>
|
|
2
2
|
import { $getRoot as getRoot, HISTORY_MERGE_TAG } from 'lexical';
|
|
3
|
-
import { getContext, onMount } from 'svelte';
|
|
3
|
+
import { getContext, onMount, untrack } from 'svelte';
|
|
4
4
|
import { IMPORT_UPDATE_TAG } from './constants.js';
|
|
5
5
|
import { handleEditorMouseDown, initEditor } from './core.js';
|
|
6
6
|
|
|
@@ -133,6 +133,58 @@
|
|
|
133
133
|
}
|
|
134
134
|
};
|
|
135
135
|
|
|
136
|
+
// The state is updated within `untrack()` or a microtask below, because the browser fires these
|
|
137
|
+
// events synchronously while it removes a focused element from the DOM, e.g. a nested editor in a
|
|
138
|
+
// component being removed, in the middle of Svelte rendering, where a plain assignment would be
|
|
139
|
+
// reported as an unsafe mutation. See also `<FloatingLinkEditor>`.
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* Check if the given element is a dialog other than the one the editor is in, if any, like a menu
|
|
143
|
+
* opened from the toolbar of a nested editor, which is rendered outside the editor.
|
|
144
|
+
* @param {Element | null} dialog Dialog element.
|
|
145
|
+
* @returns {boolean} Result.
|
|
146
|
+
*/
|
|
147
|
+
const isOtherDialog = (dialog) => !!dialog && !dialog.contains(lexicalRoot ?? null);
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* Track the focus, to tell whether it’s in an editor component, like a nested editor or a field
|
|
151
|
+
* of the component, rather than on the editor itself. The focus moving to another dialog doesn’t
|
|
152
|
+
* change anything.
|
|
153
|
+
* @param {FocusEvent} event `focusin` event.
|
|
154
|
+
*/
|
|
155
|
+
const onFocusIn = ({ target }) => {
|
|
156
|
+
const node = /** @type {Node} */ (target);
|
|
157
|
+
|
|
158
|
+
if (lexicalRoot?.contains(node)) {
|
|
159
|
+
untrack(() => {
|
|
160
|
+
editorStore.componentHasFocus = node !== lexicalRoot;
|
|
161
|
+
});
|
|
162
|
+
} else if (!(node instanceof Element && isOtherDialog(node.closest('dialog')))) {
|
|
163
|
+
untrack(() => {
|
|
164
|
+
editorStore.componentHasFocus = false;
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
};
|
|
168
|
+
|
|
169
|
+
/**
|
|
170
|
+
* Track the focus leaving a removed element, which doesn’t fire `focusin`. The event also comes
|
|
171
|
+
* without a related target when a dialog opens, which only moves the focus into itself a moment
|
|
172
|
+
* later, so the state is kept while another modal dialog is open.
|
|
173
|
+
* @param {FocusEvent} event `focusout` event.
|
|
174
|
+
*/
|
|
175
|
+
const onFocusOut = ({ relatedTarget }) => {
|
|
176
|
+
if (!relatedTarget) {
|
|
177
|
+
queueMicrotask(() => {
|
|
178
|
+
if (
|
|
179
|
+
document.activeElement === document.body &&
|
|
180
|
+
![...document.querySelectorAll(':modal')].some(isOtherDialog)
|
|
181
|
+
) {
|
|
182
|
+
editorStore.componentHasFocus = false;
|
|
183
|
+
}
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
};
|
|
187
|
+
|
|
136
188
|
onMount(() => {
|
|
137
189
|
const { editor, enabledTransformers, dispose } = initEditor(editorStore.config);
|
|
138
190
|
|
|
@@ -142,6 +194,8 @@
|
|
|
142
194
|
lexicalRoot?.addEventListener('Update', onUpdate);
|
|
143
195
|
lexicalRoot?.addEventListener('click', onClick);
|
|
144
196
|
lexicalRoot?.addEventListener('mousedown', onMouseDown);
|
|
197
|
+
document.addEventListener('focusin', onFocusIn);
|
|
198
|
+
document.addEventListener('focusout', onFocusOut);
|
|
145
199
|
|
|
146
200
|
// A change made by the user is converted to Markdown a moment later, so report it as pending
|
|
147
201
|
// until then. An import, or an update that only changes how the content looks, e.g. the code
|
|
@@ -163,6 +217,8 @@
|
|
|
163
217
|
lexicalRoot?.removeEventListener('Update', onUpdate);
|
|
164
218
|
lexicalRoot?.removeEventListener('click', onClick);
|
|
165
219
|
lexicalRoot?.removeEventListener('mousedown', onMouseDown);
|
|
220
|
+
document.removeEventListener('focusin', onFocusIn);
|
|
221
|
+
document.removeEventListener('focusout', onFocusOut);
|
|
166
222
|
dispose();
|
|
167
223
|
editor.setRootElement(null);
|
|
168
224
|
editorStore.initialized = false;
|
|
@@ -42,6 +42,8 @@ export const createEditorStore = () => {
|
|
|
42
42
|
/** @type {number} */
|
|
43
43
|
let toolbarHeight = $state(0);
|
|
44
44
|
/** @type {boolean} */
|
|
45
|
+
let componentHasFocus = $state(false);
|
|
46
|
+
/** @type {boolean} */
|
|
45
47
|
let hasConverterError = $state(false);
|
|
46
48
|
/** @type {boolean} */
|
|
47
49
|
let showConverterError = $state(false);
|
|
@@ -188,6 +190,12 @@ export const createEditorStore = () => {
|
|
|
188
190
|
set toolbarHeight(newValue) {
|
|
189
191
|
toolbarHeight = newValue;
|
|
190
192
|
},
|
|
193
|
+
get componentHasFocus() {
|
|
194
|
+
return componentHasFocus;
|
|
195
|
+
},
|
|
196
|
+
set componentHasFocus(newValue) {
|
|
197
|
+
componentHasFocus = newValue;
|
|
198
|
+
},
|
|
191
199
|
get useRichText() {
|
|
192
200
|
return useRichText;
|
|
193
201
|
},
|
|
@@ -128,7 +128,11 @@
|
|
|
128
128
|
);
|
|
129
129
|
</script>
|
|
130
130
|
|
|
131
|
-
|
|
131
|
+
<!-- Disabled while an editor component has focus, as the buttons only apply to this editor -->
|
|
132
|
+
<ToolbarWrapper
|
|
133
|
+
disabled={disabled || readonly || editorStore.componentHasFocus}
|
|
134
|
+
ariaLabel={_('_sui.text_editor.text_editor')}
|
|
135
|
+
>
|
|
132
136
|
{#if canChangeBlock && blockLevelButtons.length > 1}
|
|
133
137
|
<MenuButton
|
|
134
138
|
aria-label={_('_sui.text_editor.show_text_style_options')}
|
package/dist/typedefs.d.ts
CHANGED
|
@@ -1053,6 +1053,12 @@ export type TextEditorStore = {
|
|
|
1053
1053
|
* nested editors are placed below. `0` while the toolbar isn’t rendered.
|
|
1054
1054
|
*/
|
|
1055
1055
|
toolbarHeight: number;
|
|
1056
|
+
/**
|
|
1057
|
+
* Whether the focus is in an editor component within the
|
|
1058
|
+
* content, like a nested editor or a field of the component, rather than on the editor itself. The
|
|
1059
|
+
* toolbar is disabled meanwhile, as it would only apply to the editor itself.
|
|
1060
|
+
*/
|
|
1061
|
+
componentHasFocus: boolean;
|
|
1056
1062
|
/**
|
|
1057
1063
|
* ID of the editable element currently shown: the Lexical root in the
|
|
1058
1064
|
* rich text mode, or the `<textarea>` in the plain text mode.
|
package/dist/typedefs.js
CHANGED
|
@@ -457,6 +457,9 @@
|
|
|
457
457
|
* mode.
|
|
458
458
|
* @property {number} toolbarHeight Height of the sticky toolbar in pixels, which the toolbars of
|
|
459
459
|
* nested editors are placed below. `0` while the toolbar isn’t rendered.
|
|
460
|
+
* @property {boolean} componentHasFocus Whether the focus is in an editor component within the
|
|
461
|
+
* content, like a nested editor or a field of the component, rather than on the editor itself. The
|
|
462
|
+
* toolbar is disabled meanwhile, as it would only apply to the editor itself.
|
|
460
463
|
* @property {string} controlId ID of the editable element currently shown: the Lexical root in the
|
|
461
464
|
* rich text mode, or the `<textarea>` in the plain text mode.
|
|
462
465
|
* @property {boolean} hasConverterError Whether there was an error while converting Markdown or
|