hack to fix storybook, fix webview

wavetermdev · Dec 30, 2024 · f14a0b7 · f14a0b7
1 parent 133e351
commit f14a0b7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/frontend/app/element/search.stories.tsx b/frontend/app/element/search.stories.tsx
@@ -19,7 +19,7 @@ type Story = StoryObj<typeof Popover>;
 export const Default: Story = {
     render: (args) => {
         const props = useSearch();
-        const setIsOpen = useSetAtom(props.isOpen);
+        const setIsOpen = useSetAtom<boolean, [boolean], void>(props.isOpen);
         useEffect(() => {
             setIsOpen(true);
         }, []);
@@ -44,7 +44,7 @@ export const Default: Story = {
 export const AdditionalButtons: Story = {
     render: (args) => {
         const props = useSearch({ regex: true, caseSensitive: true, wholeWord: true });
-        const setIsOpen = useSetAtom(props.isOpen);
+        const setIsOpen = useSetAtom<boolean, [boolean], void>(props.isOpen);
         useEffect(() => {
             setIsOpen(true);
         }, []);
@@ -69,8 +69,8 @@ export const AdditionalButtons: Story = {
 export const Results10: Story = {
     render: (args) => {
         const props = useSearch();
-        const setIsOpen = useSetAtom(props.isOpen);
-        const setNumResults = useSetAtom(props.resultsCount);
+        const setIsOpen = useSetAtom<boolean, [boolean], void>(props.isOpen);
+        const setNumResults = useSetAtom<number, [number], void>(props.resultsCount);
         useEffect(() => {
             setIsOpen(true);
             setNumResults(10);
@@ -96,13 +96,13 @@ export const Results10: Story = {
 export const InputAndResults10: Story = {
     render: (args) => {
         const props = useSearch();
-        const setIsOpen = useSetAtom(props.isOpen);
-        const setNumResults = useSetAtom(props.resultsCount);
-        const setSearch = useSetAtom(props.searchValue);
+        const setIsOpen = useSetAtom<boolean, [boolean], void>(props.isOpen);
+        const setNumResults = useSetAtom<number, [number], void>(props.resultsCount);
+        const setSearch = useSetAtom<string, [string], void>(props.searchValue);
         useEffect(() => {
             setIsOpen(true);
-            setNumResults(10);
             setSearch("search term");
+            setTimeout(() => setNumResults(10), 10);
         }, []);
         return (
             <div
@@ -125,13 +125,13 @@ export const InputAndResults10: Story = {
 export const LongInputAndResults10: Story = {
     render: (args) => {
         const props = useSearch();
-        const setIsOpen = useSetAtom(props.isOpen);
-        const setNumResults = useSetAtom(props.resultsCount);
-        const setSearch = useSetAtom(props.searchValue);
+        const setIsOpen = useSetAtom<boolean, [boolean], void>(props.isOpen);
+        const setNumResults = useSetAtom<number, [number], void>(props.resultsCount);
+        const setSearch = useSetAtom<string, [string], void>(props.searchValue);
         useEffect(() => {
             setIsOpen(true);
-            setNumResults(10);
             setSearch("search term ".repeat(10).trimEnd());
+            setTimeout(() => setNumResults(10), 10);
         }, []);
         return (
             <div

diff --git a/frontend/app/element/search.tsx b/frontend/app/element/search.tsx
@@ -43,9 +43,11 @@ const SearchComponent = ({
     }, []);
 
     useEffect(() => {
-        setSearch("");
-        setIndex(0);
-        setNumResults(0);
+        if (!isOpen) {
+            setSearch("");
+            setIndex(0);
+            setNumResults(0);
+        }
     }, [isOpen]);
 
     useEffect(() => {

diff --git a/frontend/app/view/webview/webview.tsx b/frontend/app/view/webview/webview.tsx
@@ -548,7 +548,7 @@ const WebView = memo(({ model, onFailLoad }: WebViewProps) => {
     const zoomFactor = useAtomValue(getBlockMetaKeyAtom(model.blockId, "web:zoom")) || 1;
 
     // Search
-    const searchProps = useSearch(model.webviewRef, model);
+    const searchProps = useSearch({ anchorRef: model.webviewRef, viewModel: model });
     const searchVal = useAtomValue<string>(searchProps.searchValue);
     const setSearchIndex = useSetAtom(searchProps.resultsIndex);
     const setNumSearchResults = useSetAtom(searchProps.resultsCount);