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

fix(designer-ui): Remove problematic call to setIsValuePlaintext #4979

Merged
merged 3 commits into from
Jun 14, 2024
Merged

fix(designer-ui): Remove problematic call to setIsValuePlaintext #4979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
732abba
Remove problematic call to `setIsValuePlaintext`
ek68794998 Jun 14, 2024
559b556
Clean up an unused variable
ek68794998 Jun 14, 2024
4fc49bd
Ensure 'safe for lexical' is checked when switching view
ek68794998 Jun 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
20 changes: 13 additions & 7 deletions libs/designer-ui/src/lib/html/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import { HTMLChangePlugin } from './plugins/toolbar/helper/HTMLChangePlugin';
import { isHtmlStringValueSafeForLexical } from './plugins/toolbar/helper/util';
import { useState } from 'react';

const isValueSafeForLexical = (value: ValueSegment[]) => {
const blankNodeMap = new Map<string, ValueSegment>();
const initialValueString = convertSegmentsToString(value, blankNodeMap);
return isHtmlStringValueSafeForLexical(initialValueString, blankNodeMap);
};

export const HTMLEditor = ({ initialValue, onChange, ...baseEditorProps }: BaseEditorProps): JSX.Element => {
const [isValuePlaintext, setIsValuePlaintext] = useState(() => {
const blankNodeMap = new Map<string, ValueSegment>();
const initialValueString = convertSegmentsToString(initialValue, blankNodeMap);
return !isHtmlStringValueSafeForLexical(initialValueString, blankNodeMap);
});
const [isValuePlaintext, setIsValuePlaintext] = useState(() => !isValueSafeForLexical(initialValue));
const [isSwitchFromPlaintextBlocked, setIsSwitchFromPlaintextBlocked] = useState(() => isValuePlaintext);
const [value, setValue] = useState<ValueSegment[]>(initialValue);

Expand All @@ -23,6 +25,11 @@ export const HTMLEditor = ({ initialValue, onChange, ...baseEditorProps }: BaseE
onChange?.({ value: value });
};

const handleSetIsValuePlaintext = (newIsPlaintext: boolean) => {
setIsValuePlaintext(newIsPlaintext);
setIsSwitchFromPlaintextBlocked(!isValueSafeForLexical(value));
};

return (
<EditorWrapper
{...baseEditorProps}
Expand All @@ -39,12 +46,11 @@ export const HTMLEditor = ({ initialValue, onChange, ...baseEditorProps }: BaseE
}}
isSwitchFromPlaintextBlocked={isSwitchFromPlaintextBlocked}
onBlur={handleBlur}
setIsValuePlaintext={setIsValuePlaintext}
setIsValuePlaintext={handleSetIsValuePlaintext}
>
<HTMLChangePlugin
isValuePlaintext={isValuePlaintext}
setIsSwitchFromPlaintextBlocked={setIsSwitchFromPlaintextBlocked}
setIsValuePlaintext={setIsValuePlaintext}
setValue={onValueChange}
/>
</EditorWrapper>
Expand Down
15 changes: 2 additions & 13 deletions libs/designer-ui/src/lib/html/plugins/toolbar/helper/HTMLChangePlugin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,20 @@ import { $getRoot } from 'lexical';
export interface HTMLChangePluginProps {
isValuePlaintext: boolean;
setIsSwitchFromPlaintextBlocked: (value: boolean) => void;
setIsValuePlaintext: (isValuePlaintext: boolean) => void;
setValue: (newVal: ValueSegment[]) => void;
}

export const HTMLChangePlugin = ({
isValuePlaintext,
setIsSwitchFromPlaintextBlocked,
setIsValuePlaintext,
setValue,
}: HTMLChangePluginProps) => {
export const HTMLChangePlugin = ({ isValuePlaintext, setIsSwitchFromPlaintextBlocked, setValue }: HTMLChangePluginProps) => {
const onChange = (editorState: EditorState, editor: LexicalEditor) => {
const nodeMap = new Map<string, ValueSegment>();
let isNewValuePlaintext = isValuePlaintext;

editorState.read(() => {
const editorString = getChildrenNodes($getRoot(), nodeMap);
const isSafeForLexical = isHtmlStringValueSafeForLexical(editorString, nodeMap);

setIsSwitchFromPlaintextBlocked(!isSafeForLexical);
if (!isSafeForLexical) {
isNewValuePlaintext = true;
setIsValuePlaintext(isNewValuePlaintext);
}

convertEditorState(editor, nodeMap, { isValuePlaintext: isNewValuePlaintext }).then(setValue);
convertEditorState(editor, nodeMap, { isValuePlaintext }).then(setValue);
});
};
return <OnChangePlugin ignoreSelectionChange onChange={onChange} />;
Expand Down
Loading