@netlify/spark-ui 1.5.0-alpha.9 → 1.6.0

package/packages/components/preact/SearchModal/components/SearchLink/SearchLink.css

@@ -1,6 +1,6 @@
 .n-search-link {
-  --n-search-icon-size: 1.25em;
-  box-sizing: border-box;
+  --n-search-icon-size: 1em;
+  all: unset;
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
@@ -11,11 +11,6 @@
   font-weight: var(--font-weight-regular);
   text-decoration: none;
   cursor: pointer;
-  width: 100%;
-  border: none;
-  text-align: left;
-  outline: none;
-  border-radius: var(--radius-l);
 }
 
 .n-search-link-body {
@@ -25,17 +20,17 @@
   text-wrap: pretty;
 }
 
-.n-search-link:is(:hover, :focus-visible) {
+.n-search-link:is(:hover, :focus-within) {
   background: var(--n-search-color-bg-2);
 
   & .n-search-link-icon [data-icon='caretRight'] {
-    opacity: 1;
+    display: block;
   }
 }
 
 .n-search-link-title {
   font-weight: var(--font-weight-medium);
-  color: var(--color-text-1);
+  color: var(--color-text);
   line-height: 1.5;
 }
 
@@ -54,8 +49,7 @@
   background-color: var(--mark-bg, var(--color-highlight));
 }
 
-.n-search-link-icon,
-.n-search-link-icon svg {
+.n-search-link-icon {
   display: flex;
   width: var(--n-search-icon-size);
   height: var(--n-search-icon-size);
@@ -63,8 +57,9 @@
 }
 
 .n-search-link-icon [data-icon='caretRight'] {
-  width: 1em;
-  opacity: 0;
+  display: none;
+  width: 0.8em;
+  opacity: 0.3;
 }
 
 .n-search-link-label {

package/packages/components/preact/SearchModal/components/SearchLink/SearchLink.tsx

@@ -4,40 +4,20 @@ import './SearchLink.css';
 
 import Icon from '../../../Icon';
 
-const SearchLink = ({
-  as: Component = 'a',
-  icon,
-  label,
-  url,
-  excerpt,
-  resource,
-  onClick,
-}: SearchLinkProps) => {
-  const { handleClick: log } = useSearchLogger();
-
+const SearchLink = ({ icon, label, url, excerpt, resource }: SearchLinkProps) => {
+  const { handleClick } = useSearchLogger()
+  
   return (
-    <Component
-      className="n-search-link"
-      href={url}
-      onClick={(e: Event) => {
-        onClick && onClick();
-        log(e);
-      }}
-    >
+    <a className="n-search-link" href={url} onClick={handleClick}>
       {icon && (
         <span className="n-search-link-icon">
           <Icon name={icon} />
         </span>
       )}
       <div className="n-search-link-body">
+        
         <p className="n-search-link-title">
-          <span className="n-search-link-label">{label}</span>{' '}
-          {resource && (
-            <span className="n-search-link-badge" data-resource={resource}>
-              {resource}
-            </span>
-          )}
-        </p>
+        <span className="n-search-link-label">{label}</span> {resource && <span className="n-search-link-badge" data-resource={resource}>{resource}</span>}</p>
         {excerpt && (
           <p className="n-search-link-excerpt" dangerouslySetInnerHTML={{ __html: excerpt }} />
         )}
@@ -45,7 +25,7 @@ const SearchLink = ({
       <div className="n-search-link-icon">
         <Icon name="caretRight" />
       </div>
-    </Component>
+    </a>
   );
 };
 

package/packages/components/preact/SearchModal/components/SearchModal/SearchModal.css

@@ -4,18 +4,15 @@
 
 /* Root Variables */
 .n-search-modal {
-  --n-search-padding-inline: var(--space-s);
-  --n-search-color-text: var(--color-text-1, currentColor);
-  --n-search-color-text-secondary: var(--color-text-weaker, currentColor);
+  --n-search-padding-inline: 0.5em;
+  --n-search-color-text: var(--color-text, currentColor);
+  --n-search-color-text-secondary: var(--color-text-weak, currentColor);
   --n-search-color-bg: var(--search-bg-color);
-  --n-search-color-bg-2: var(--color-bg-3);
+  --n-search-color-bg-2: var(--color-bg-2);
   --n-search-color-border: var(--color-bg-3);
-  --n-search-border-radius: 1.3rem;
+  --n-search-border-radius: 8px;
   --n-search-max-w: 600px;
   --n-search-text-highlight: var(--search-highlight-color);
-  --n-search-input-height: 50px;
-  --n-search-footer-height: 40px;
-  --n-search-container-height: 400px;
 }
 
 .n-search-modal {
@@ -24,17 +21,13 @@
   border-radius: var(--n-search-border-radius);
   width: min(var(--n-search-max-w), 100%);
   margin: auto;
-  background: var(--n-search-color-bg);
-}
-
-.n-search-modal-ask {
-  --n-search-max-w: 800px;
 }
 
 .n-search-container {
   --mark-bg: var(--n-search-text-highlight);
   display: grid;
   width: min(var(--n-search-max-w), 100%);
+  min-height: 470px;
   background-color: var(--n-search-color-bg);
   border-radius: var(--n-search-border-radius);
   overflow: hidden;
@@ -50,14 +43,13 @@
 }
 
 .n-search-input-wrapper {
-  position: relative;
+  all: unset;
   display: flex;
   width: 100%;
-  height: var(--n-search-input-height);
+  border-bottom: 1px solid var(--n-search-color-border);
 }
 
 .n-search-input {
-  position: relative;
   display: inline-flex;
   box-sizing: border-box;
   background: var(--n-search-color-bg);
@@ -68,32 +60,16 @@
   border: none;
   outline: none;
   font-size: 1rem;
-  color: var(--color-text-1);
-}
-
-.n-search-input-wrapper::after,
-.n-search-footer::after {
-  content: '';
-  display: block;
-  width: 200%;
-  height: 1px;
-  background: var(--n-search-color-border);
-  position: absolute;
-  bottom: 0;
-  left: 0;
+  color: var(--color-text);
 }
 
 .n-search-input::placeholder {
-  color: var(--n-search-color-text-secondary);
-}
-
-.n-search-links {
-  padding: var(--space-2xs);
+  color: var(--n-search-color-text);
 }
 
 .n-search-label {
   display: flex;
-  padding-inline-start: var(--n-search-padding-inline);
+  padding-inline: var(--n-search-padding-inline);
   align-items: center;
 }
 
@@ -104,8 +80,8 @@
 
 .n-search-icon {
   display: flex;
-  width: var(--n-search-icon-size, 1em);
-  height: var(--n-search-icon-size, 1em);
+  width: var(--n-search-icon-size, 0.8em);
+  height: var(--n-search-icon-size, 0.8em);
   color: var(--n-search-color-text-secondary);
 }
 
@@ -116,26 +92,28 @@
 
 /* Search Results */
 .n-search-window {
-  height: var(--n-search-container-height);
+  height: 400px;
   overflow-x: hidden;
   overflow-y: auto;
   overscroll-behavior: contain;
-  scroll-padding-block: var(--space-s);
   margin-block: 0;
   background: var(--n-search-color-bg);
 }
 
+.n-results-list-item {
+  border-bottom: 1px solid var(--color-bg-3);
+}
+.n-results-list-item:first-of-type {
+  border-top: 1px solid var(--color-bg-3);
+}
+
 /* Footer */
 .n-search-footer {
-  position: relative;
+  border-top: 1px solid var(--n-search-color-border);
+  padding: var(--space-2xs) var(--space-s);
+  background: var(--color-bg-2);
   display: flex;
   gap: var(--space-m);
-  padding: var(--space-2xs) var(--space-s);
-  height: var(--n-search-footer-height);
-}
-
-.n-search-footer::after {
-  top: 0;
 }
 
 .n-search-footer-tip {
@@ -150,8 +128,7 @@
 .n-search-modal {
   transition:
     display 0.2s allow-discrete,
-    overlay 0.2s allow-discrete,
-    width 0.15s ease-in-out;
+    overlay 0.2s allow-discrete;
   animation: closeSearch 0.2s forwards;
 }
 
@@ -159,43 +136,28 @@
   animation: openSearch 0.2s forwards;
 }
 
-.n-search-modal[data-state='search'] > * {
-  opacity: 0;
-  animation: appearContainer 120ms ease-in-out forwards;
-  animation-delay: 140ms;
-}
-
-@keyframes appearContainer {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-
 @keyframes openSearch {
   from {
     opacity: 0;
-    transform: scale(0.9);
+    transform: translateY(20px) scale(0.9);
   }
   to {
     opacity: 1;
-    transform: scale(1);
+    transform: translateY(0px) scale(1);
   }
 }
 
 @keyframes closeSearch {
   from {
     opacity: 1;
-    transform: scale(1);
+    transform: translateY(0px) scale(1);
   }
   50% {
     opacity: 0.3;
   }
   to {
     opacity: 0;
-    transform: scale(0.9);
+    transform: translateY(20px) scale(0.9);
   }
 }
 

package/packages/components/preact/SearchModal/components/SearchModal/SearchModal.tsx

@@ -15,24 +15,20 @@ import {
   useSearchLogger,
 } from '../../hooks';
 
-import AskNetlify from '../../../../preact/AskNetlify/AskNetlify';
-
 import './SearchModal.css';
 
 interface Props {
   children: ComponentChildren;
   className?: string;
-  debug?: boolean;
+  debug?: boolean
 }
 
-function SearchModal(props: Props = { className: '', children: null, debug: false }) {
+function SearchModal(props: Props = {className: '', children: null, debug: false }) {
   const [isPagefindLoaded, setIsPagefindLoaded] = useState(false);
-  const [modalState, setModalState] = useState({ current: 'search' });
-  const [askNetlifyQuery, setAskNetlifyQuery] = useState('');
 
   // Poll for the existence of window.pagefind.
   useEffect(() => {
-    let intervalId: number;
+    let intervalId:number;
 
     const checkForPagefind = () => {
       if (window.pagefind) {
@@ -49,18 +45,19 @@ function SearchModal(props: Props = { className: '', children: null, debug: fals
     return () => clearInterval(intervalId);
   }, []);
 
+
   const { children, className, debug, ...rest } = props;
   const { state, actions } = useSearch();
-
   const [searchOpen, setSearchOpen] = useState(false);
+
   const openSearch = () => setSearchOpen(true);
   const closeSearch = () => setSearchOpen(false);
 
   const modalRef = useRef<HTMLDialogElement>(null);
   const containerRef = useClickOutside<HTMLDivElement>(closeSearch);
 
-  useSearchLogger(state, debug);
-  useSearchToggles(isPagefindLoaded, openSearch, setModalState);
+  useSearchLogger(state, debug)
+  useSearchToggles(isPagefindLoaded,  openSearch);
   useSearchParams(isPagefindLoaded, actions.setSearchTerm, openSearch);
   useSearchHotkeys(isPagefindLoaded, searchOpen, openSearch, closeSearch);
   useKeyboardNav(isPagefindLoaded, modalRef, searchOpen, closeSearch);
@@ -70,58 +67,31 @@ function SearchModal(props: Props = { className: '', children: null, debug: fals
     searchOpen ? modalRef.current.showModal() : modalRef.current.close();
   }, [searchOpen]);
 
-  useEffect(() => {
-    const input = modalRef.current?.querySelector('input');
-
-    if (input) input.focus();
-
-    if (modalState.current === 'ask') {
-      setTimeout(() => {
-        modalRef.current.classList.add('n-search-modal-ask');
-      }, 150);
-    } else if (modalState.current === 'search') {
-      setTimeout(() => {
-        modalRef.current.classList.remove('n-search-modal-ask');
-      }, 150);
-    }
-  }, [modalState.current]);
-
   return (
-    <Modal
-      ref={modalRef}
-      className={`n-search-modal ${className ? className : ''}`}
-      data-state={modalState.current}
-      {...rest}
-    >
+    <Modal ref={modalRef} className={`n-search-modal ${className ? className : ''}`} {...rest}>
       <div ref={containerRef} className="n-search-container">
-        {modalState.current === 'ask' && <AskNetlify setModalState={setModalState} />}
-        {modalState.current === 'search' && (
-          <>
-            <SearchInput setSearchTerm={actions.setSearchTerm} initialValue={state.searchTerm} />
-
-            <SearchWindow
-              setModalState={setModalState}
-              searchLoading={state.isLoading}
-              searchTerm={state.searchTerm}
-              results={state.results}
-            >
-              {children}
-            </SearchWindow>
-
-            <div className="n-search-footer">
-              <p className="n-search-footer-tip">
-                <KeyboardKey keyNames={['Esc']} />
-                to close
-              </p>
-              <p className="n-search-footer-tip">
-                <KeyboardKey keyNames={['Tab']} />
-                <span>or</span>
-                <KeyboardKey keyNames={['↑', '↓']} />
-                to navigate
-              </p>
-            </div>
-          </>
-        )}
+          <SearchInput setSearchTerm={actions.setSearchTerm} initialValue={state.searchTerm} />
+
+        <SearchWindow
+          searchLoading={state.isLoading}
+          searchTerm={state.searchTerm}
+          results={state.results}
+        >
+          {children}
+        </SearchWindow>
+
+        <div className="n-search-footer">
+          <p className="n-search-footer-tip">
+            <KeyboardKey keyNames={['Esc']} />
+            to close
+          </p>
+          <p className="n-search-footer-tip">
+            <KeyboardKey keyNames={['Tab']} />
+            <span>or</span>
+            <KeyboardKey keyNames={['↑', '↓']} />
+            to navigate
+          </p>
+        </div>
       </div>
     </Modal>
   );

package/packages/components/preact/SearchModal/components/SearchWindow.tsx

@@ -1,11 +1,9 @@
 import type { FunctionComponent } from 'preact';
-import type { SearchResultsProps, SearchWindowProps } from '../types/search.types';
+import type { SearchLinkProps, SearchResultsProps, SearchWindowProps } from '../types/search.types';
 import { useMemo } from 'preact/hooks';
 import SearchHeading from './SearchHeading/SearchHeading';
 import SearchLink from './SearchLink/SearchLink';
 
-import { handleThemeChange, ThemeMap, Theme } from '../../../../utils/theme';
-
 /* --- Search Results Window (for active searches) --- */
 const SearchResults: FunctionComponent<SearchResultsProps> = ({
   searchLoading,
@@ -22,9 +20,9 @@ const SearchResults: FunctionComponent<SearchResultsProps> = ({
 
   if (!results || results.length === 0) {
     return (
-      <SearchHeading>
-        0 results for <span className="n-search-term">{searchTerm}</span>
-      </SearchHeading>
+        <SearchHeading>
+          0 results for <span className="n-search-term">{searchTerm}</span>
+        </SearchHeading>
     );
   }
 
@@ -45,41 +43,29 @@ const SearchResults: FunctionComponent<SearchResultsProps> = ({
 
 /* --- Main Search Results Component --- */
 export default function SearchWindow({
-  setModalState,
   searchLoading,
   searchTerm,
   results,
   children: DefaultWindow,
 }: SearchWindowProps) {
+  const askNetlify: SearchLinkProps = {
+    icon: 'sparkles',
+    label: 'Ask Netlify AI',
+    url: 'https://docs.netlify.com/ask-netlify/',
+  };
+
   return (
     <div className="n-search-window">
-      <div className="n-search-links">
+      <div className="search-links">
+        <SearchLink {...askNetlify} />
         {searchTerm && searchTerm.length > 1 ? (
-          <SearchResults searchLoading={searchLoading} searchTerm={searchTerm} results={results} />
+          <SearchResults
+            searchLoading={searchLoading}
+            searchTerm={searchTerm}
+            results={results}
+          />
         ) : DefaultWindow ? (
-          <>
-            <SearchLink
-              as="button"
-              icon="askNetlify"
-              label="Ask Netlify AI"
-              onClick={() => {
-                setModalState({ current: 'ask' });
-              }}
-            />
-
-            {DefaultWindow}
-
-            <SearchHeading>Actions</SearchHeading>
-            <SearchLink
-              as="button"
-              icon="lightbulb"
-              label="Toggle theme"
-              onClick={() => {
-                const theme = document.documentElement.getAttribute('data-theme') as Theme;
-                theme && handleThemeChange(ThemeMap[theme]);
-              }}
-            />
-          </>
+          DefaultWindow
         ) : null}
       </div>
     </div>

package/packages/components/preact/SearchModal/hooks/useKeyboardNav.ts

@@ -21,7 +21,7 @@ export function useKeyboardNav(
   onClose: () => void
 ) {
   useEffect(() => {
-    if (!isPagefindLoaded) return;
+    if (!isPagefindLoaded) return 
     const handleKeydown = (e: KeyboardEvent) => {
       if (!isOpen) return;
 
@@ -35,7 +35,7 @@ export function useKeyboardNav(
         const container = containerRef.current;
         if (!container) return;
 
-        const links = Array.from(container.querySelectorAll('.n-search-link'));
+        const links = Array.from(container.querySelectorAll('a'));
         const currentIndex = links.findIndex(link => link === document.activeElement);
         const nextIndex =
           e.key === 'ArrowDown'

package/packages/components/preact/SearchModal/hooks/useSearchToggles.ts

@@ -12,24 +12,16 @@ import { useEffect } from 'preact/hooks';
  * @param onOpen - A function to be called when a toggle element is clicked.
  */
 
-export function useSearchToggles(
-  isPagefindLoaded: boolean,
-  onOpen: () => void,
-  setState: (state: { current: string }) => void
-) {
+export function useSearchToggles(isPagefindLoaded: boolean, onOpen: () => void) {
   useEffect(() => {
-    if (!isPagefindLoaded) return;
+    if (!isPagefindLoaded) return
     const toggles = document.querySelectorAll('[data-ntl-search-toggle]');
 
     if (!toggles.length) return;
 
     toggles.forEach(t => {
-      const current = t.dataset.ntlSearchToggle ? t.dataset.ntlSearchToggle : 'search';
       t.removeAttribute('disabled');
-      t.addEventListener('click', () => {
-        onOpen();
-        setState({ current });
-      });
+      t.addEventListener('click', onOpen);
     });
 
     return () => {

package/packages/components/preact/SearchModal/types/search.types.tsx

@@ -2,17 +2,14 @@ import type { ComponentChildren } from 'preact';
 import type { IconName } from '../../Icon';
 
 export interface SearchLinkProps {
-  as?: any;
   icon: IconName;
   label: string;
   resource?: 'blog' | 'changelog' | 'docs' | 'guide';
-  url?: string;
+  url: string;
   excerpt?: string;
-  onClick?: () => void;
 }
 
 export interface SearchWindowProps {
-  setModalState: (e: { current: string }) => void;
   searchLoading: boolean;
   searchTerm?: string;
   results?: SearchLinkProps[];
@@ -36,4 +33,4 @@ export interface SearchGTMObjectProps {
   resultUrl?: string;
   query?: string;
   debug_mode?: boolean;
-}
+}

package/packages/components/preact/index.ts

@@ -4,7 +4,6 @@ export { default as Icon } from './Icon';
 export { default as SearchLink } from './SearchModal/components/SearchLink/SearchLink';
 export { default as SearchHeading } from './SearchModal/components/SearchHeading/SearchHeading';
 export { default as SearchToggle } from './SearchModal/components/SearchToggle/SearchToggle';
-export { default as AskNetlify } from "./AskNetlify/AskNetlify"
 export { SearchModal } from './SearchModal';
 
 export { type IconName } from './Icon';