Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/lib/holocene/code-block.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
[
getEditorTheme($useDarkMode, hasHeader),
getActionsTheme({ hasActions: copyable || maximizable }),
EditorState.readOnly.of(!editable),
EditorView.editable.of(editable),
EditorState.readOnly.of(!editable), // when false, user can type in the editor
EditorView.editable.of(true), // always true, it means focusable, text-selectable, and scrollable by keyboard
EditorView.contentAttributes.of({ 'aria-label': label }),
getLineBreakExtension(editable),
getLanguageExtension(language),
Expand Down Expand Up @@ -199,15 +199,6 @@
});
});

// add tabindex if maximizable, so up/down arrows can scroll
$effect(() => {
if (maximizable) {
editorView?.scrollDOM?.setAttribute('tabindex', '0');
} else {
editorView?.scrollDOM?.removeAttribute('tabindex');
}
});

// when content prop changes, update the document
$effect(() => {
content;
Expand Down Expand Up @@ -297,7 +288,6 @@
class={merge('h-full', className)}
data-testid={testId}
{...editorProps}
onblur={handleEditorBlur}
></div>

{#snippet actions()}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/holocene/maximizable/maximizable.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
};

const handleFocusOut = (event: FocusEvent) => {
const currentTarget = event.currentTarget as Element | null;
const relatedTarget = event.relatedTarget as Element | null;
if (
maximized &&
(!(event.currentTarget instanceof Element) ||
!(event.relatedTarget instanceof Element) ||
!event.currentTarget.contains(event.relatedTarget))
!(currentTarget && relatedTarget && currentTarget.contains(relatedTarget))
) {
maximized = false;
}
Expand Down
Loading