@likec4/diagram 1.50.0 → 1.52.0

package/dist/search/components/ViewsColum.js

@@ -6,9 +6,9 @@ import { Stack, VisuallyHidden, UnstyledButton, ThemeIcon, Group, Highlight, Bad
 import * as m from 'motion/react-m';
 import { memo, useRef, useMemo } from 'react';
 import { first } from 'remeda';
-import { useCurrentViewId } from '../../hooks/useCurrentView.js';
 import { useLikeC4Model } from '../../hooks/useLikeC4Model.js';
-import { useNormalizedSearch, useSearchActor } from '../hooks.js';
+import { useNormalizedSearch } from '../hooks.js';
+import { useSearchContext } from '../SearchContext.js';
 import { emptyBoX, focusable, buttonsva } from './_shared.css.js';
 import { moveFocusToSearchInput, queryAllFocusable, centerY } from './utils.js';
 import { viewButton } from './ViewsColumn.css.js';
@@ -17,7 +17,7 @@ import IconZoomScan from '../../node_modules/.pnpm/@tabler_icons-react@3.36.1_re
 
 const NothingFound = () => /* @__PURE__ */ jsx(Box, { className: emptyBoX, children: "Nothing found" });
 const useFoundViews = () => {
-  const currentViewId = useCurrentViewId();
+  const { currentViewId } = useSearchContext();
   const likec4model = useLikeC4Model();
   const search = useNormalizedSearch();
   return useMemo(() => {
@@ -79,7 +79,7 @@ const ViewsColumn = memo(() => {
           ViewButton,
           {
             view,
-            currentViewId,
+            currentViewId: currentViewId ?? "",
             search,
             tabIndex: i === 0 ? 0 : -1
           }
@@ -90,15 +90,11 @@ const ViewsColumn = memo(() => {
 });
 const btn = buttonsva();
 function ViewButton({ className, view, loop = false, search, focusOnElement, currentViewId, ...props }) {
-  const searchActorRef = useSearchActor();
+  const ctx = useSearchContext();
   const nextViewId = view.id;
   const isCurrentView = nextViewId === currentViewId;
   const navigate = () => {
-    searchActorRef.send({
-      type: "navigate.to",
-      viewId: nextViewId,
-      focusOnElement
-    });
+    ctx.navigateTo(nextViewId, focusOnElement);
   };
   return /* @__PURE__ */ jsxs(
     UnstyledButton,

package/dist/search/hooks.d.ts

@@ -1,5 +1,3 @@
-import { SearchActorRef } from './searchActor';
-export declare function useSearchActor(): SearchActorRef;
 export declare function useSearch(): [string, (search: string) => void];
 export declare function useNormalizedSearch(): string;
 export declare function useUpdateSearch(): (search: string) => void;

package/dist/search/hooks.js

@@ -1,41 +1,15 @@
-import { useSelector } from '@xstate/react';
 import { useCallback, useDeferredValue } from 'react';
-import { useSearchActorRef } from '../hooks/useSearchActor.js';
+import { useSearchContext } from './SearchContext.js';
 
-function useSearchActor() {
-  const searchActorRef = useSearchActorRef();
-  if (!searchActorRef) {
-    throw new Error("Search actor not found");
-  }
-  return searchActorRef;
-}
-const selectSearchValue = (s) => s.context.searchValue;
-function useSearch() {
-  const searchActorRef = useSearchActor();
-  const searchValue = useSelector(searchActorRef, selectSearchValue);
-  const updateSearch = useCallback((search) => {
-    searchActorRef.send({ type: "change.search", search });
-  }, [searchActorRef]);
-  return [searchValue, updateSearch];
-}
-const selectNormalizedSearchValue = (s) => {
-  let v = selectSearchValue(s);
-  if (v === "") return v;
-  v = v.trim().toLowerCase();
-  if (v.startsWith("#") && v.length <= 2) {
-    return "";
-  }
-  return v.length > 1 ? v : "";
-};
 function useNormalizedSearch() {
-  const searchActorRef = useSearchActor();
-  return useDeferredValue(useSelector(searchActorRef, selectNormalizedSearchValue));
+  const ctx = useSearchContext();
+  return useDeferredValue(ctx.normalizedSearch);
 }
 function useUpdateSearch() {
-  const searchActorRef = useSearchActor();
+  const { setSearchValue } = useSearchContext();
   return useCallback((search) => {
-    searchActorRef.send({ type: "change.search", search });
-  }, [searchActorRef]);
+    setSearchValue(search);
+  }, [setSearchValue]);
 }
 
-export { useNormalizedSearch, useSearch, useSearchActor, useUpdateSearch };
+export { useNormalizedSearch, useUpdateSearch };