Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[lexical-devtools] Feature: Reflect picker state on inspector button ui #6077

Merged
merged 7 commits into from
May 15, 2024
Merged

[lexical-devtools] Feature: Reflect picker state on inspector button ui #6077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6687b2
add active state on inspector button
2wheeh May 10, 2024
7641291
Revert "add active state on inspector button"
2wheeh May 13, 2024
8a25082
use extenstionStore and refactor
2wheeh May 14, 2024
9f3202d
per tab
2wheeh May 14, 2024
5768ea3
type
2wheeh May 14, 2024
1b95832
init tab states on the panel entry
2wheeh May 14, 2024
5182de2
Revert "init tab states on the panel entry"
2wheeh May 14, 2024
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
6 changes: 6 additions & 0 deletions ...ages/lexical-devtools/src/entrypoints/devtools-panel/components/EditorInspectorButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {IconButton, Image} from '@chakra-ui/react';
import {getRPCService} from '@webext-pegasus/rpc';
import * as React from 'react';

import {useExtensionStore} from '../../../store';
import {IInjectedPegasusService} from '../../injected/InjectedPegasusService';

interface Props {
Expand All @@ -18,6 +19,9 @@ interface Props {
}

export function EditorInspectorButton({tabID, setErrorMessage}: Props) {
const {isSelecting} = useExtensionStore();
const isActive = isSelecting[tabID] ?? false;

const handleClick = () => {
const injectedPegasusService = getRPCService<IInjectedPegasusService>(
'InjectedPegasusService',
Expand All @@ -41,6 +45,8 @@ export function EditorInspectorButton({tabID, setErrorMessage}: Props) {
size="xs"
onClick={handleClick}
icon={<Image w={5} src="/inspect.svg" />}
isActive={isActive}
_active={{bg: 'blue.100'}}
/>
);
}
24 changes: 16 additions & 8 deletions packages/lexical-devtools/src/entrypoints/injected/InjectedPegasusService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,21 @@ export class InjectedPegasusService
}

toggleEditorPicker(): void {
if (this.pickerActive != null) {
this.pickerActive?.stop();
this.pickerActive = null;

return;
if (this.pickerActive !== null) {
this.deactivatePicker();
} else {
this.activatePicker();
}
}

private activatePicker(): void {
this.extensionStore.getState().setIsSelecting(this.tabID, true);

this.pickerActive = new ElementPicker({style: ELEMENT_PICKER_STYLE});
this.pickerActive.start({
elementFilter: (el) => {
let parent: HTMLElement | null = el;
while (parent != null && parent.tagName !== 'BODY') {
while (parent !== null && parent.tagName !== 'BODY') {
if ('__lexicalEditor' in parent) {
return parent;
}
Expand All @@ -108,8 +111,7 @@ export class InjectedPegasusService
},

onClick: (el) => {
this.pickerActive?.stop();
this.pickerActive = null;
this.deactivatePicker();
if (isLexicalNode(el)) {
this.extensionStore
.getState()
Expand All @@ -120,4 +122,10 @@ export class InjectedPegasusService
},
});
}

private deactivatePicker(): void {
this.pickerActive?.stop();
this.pickerActive = null;
this.extensionStore.getState().setIsSelecting(this.tabID, false);
}
}
12 changes: 12 additions & 0 deletions packages/lexical-devtools/src/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,21 @@ export interface ExtensionState {
selectedEditorKey: {
[tabID: number]: string | null;
};
isSelecting: {
[tabID: number]: boolean;
};
markTabAsRestricted: (tabID: number) => void;
setStatesForTab: (
id: number,
states: {[editorKey: string]: SerializedRawEditorState},
) => void;
setSelectedEditorKey: (tabID: number, editorKey: string | null) => void;
setIsSelecting: (tadID: number, isSelecting: boolean) => void;
}

export const useExtensionStore = create<ExtensionState>()(
subscribeWithSelector((set) => ({
isSelecting: {},
lexicalState: {},
markTabAsRestricted: (tabID: number) =>
set((state) => ({
Expand All @@ -41,6 +46,13 @@ export const useExtensionStore = create<ExtensionState>()(
},
})),
selectedEditorKey: {},
setIsSelecting: (tabID: number, isSelecting: boolean) =>
set((state) => ({
isSelecting: {
...state.isSelecting,
[tabID]: isSelecting,
},
})),
setSelectedEditorKey: (tabID: number, editorKey: string | null) =>
set((state) => ({
selectedEditorKey: {
Expand Down
Loading