diff --git a/remix/app/Providers/ThingtimeProvider.tsx b/remix/app/Providers/ThingtimeProvider.tsx index 3c17397..ce16de3 100644 --- a/remix/app/Providers/ThingtimeProvider.tsx +++ b/remix/app/Providers/ThingtimeProvider.tsx @@ -24,8 +24,9 @@ try { const force = { settings: { // commanderActive: false, + // hideSuggestionsOnToggle: true, }, - version: 22, + version: 23, } const newVersionData = { @@ -43,6 +44,7 @@ const initialValues = { commanderActive: false, clearCommanderOnToggle: true, clearCommanderContextOnToggle: true, + hideSuggestionsOnToggle: true, }, Content: { hidden1: "Edit this to your heart's desire.", diff --git a/remix/app/components/Commander/Commander.tsx b/remix/app/components/Commander/Commander.tsx index ce2705d..cf40e08 100644 --- a/remix/app/components/Commander/Commander.tsx +++ b/remix/app/components/Commander/Commander.tsx @@ -148,10 +148,6 @@ export const Commander = (props) => { return commandPath && commandValue }, [commandPath, commandValue]) - const showSuggestions = React.useMemo(() => { - return inputValue?.length - }, [inputValue]) - const suggestions = React.useMemo(() => { try { const fuse = new Fuse(paths) @@ -168,6 +164,20 @@ export const Commander = (props) => { } }, [inputValue, paths]) + const showSuggestions = React.useMemo(() => { + return ( + inputValue?.length && + suggestions?.length && + commanderActive && + thingtime?.settings?.hideSuggestionsOnToggle + ) + }, [ + inputValue, + suggestions, + commanderActive, + thingtime?.settings?.hideSuggestionsOnToggle, + ]) + const selectSuggestion = React.useCallback( (suggestionIdx) => { const suggestion = suggestions?.[suggestionIdx] @@ -445,7 +455,11 @@ export const Commander = (props) => { pointerEvents="all" paddingY={3} > - + )} diff --git a/remix/app/components/Thingtime/Thingtime.tsx b/remix/app/components/Thingtime/Thingtime.tsx index d5cb44d..6f43df1 100644 --- a/remix/app/components/Thingtime/Thingtime.tsx +++ b/remix/app/components/Thingtime/Thingtime.tsx @@ -293,7 +293,9 @@ export const Thingtime = (props) => { paddingLeft={props?.pl || props?.paddingLeft} fontSize="20px" border="none" - whiteSpace="pre-line" + // whiteSpace="pre-line" + whiteSpace="pre-wrap" + wordBreak={props?.wordBreak || "break-word"} outline="none" paddingY={2} // dangerouslySetInnerHTML={{ __html: renderableValue }} diff --git a/remix/tsconfig.json b/remix/tsconfig.json index 038640a..12a7428 100644 --- a/remix/tsconfig.json +++ b/remix/tsconfig.json @@ -2,6 +2,7 @@ "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"], "compilerOptions": { "noImplicitAny": false, + "strictNullChecks": false, "lib": ["DOM", "DOM.Iterable", "ES2019"], "isolatedModules": true, "esModuleInterop": true,