@envive-ai/react-toolkit 0.2.3 → 0.2.5

package/src/components/SearchInputForm/SearchInputForm.tsx

@@ -1,3 +1,5 @@
+import classNames from 'classnames';
+import { SEARCH_INPUT_TESTID } from '@envive-ai/react-hooks/config/locators/components/search';
 import { SearchAutocomplete } from '../SearchAutocomplete';
 import { SearchInput } from '../SearchInput/SearchInput';
 import { searchInputVariantClasses } from '../SearchInput/searchInputVariants';
@@ -9,13 +11,14 @@ interface SearchInputFormProps {
   autocompleteResults: string[];
   searchBoxPlaceholder: string;
   focusedOptionId: string | undefined;
-  isDirty: boolean;
   focusedIndex: number;
   onKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void;
-  onAutocompleteSelect: (suggestion: string) => void;
+  onAutocompleteSelect: (suggestion: string, rankPosition?: number) => void;
   onSearchInputChange: (value: string) => void;
   onSearchSubmit: () => void;
-  searchInputDataTestId?: string;
+  onSearchInputFocus: () => void;
+  onSearchInputBlur: () => void;
+  shouldShowAutocomplete: boolean;
 }
 
 export const SearchInputForm = ({
@@ -24,24 +27,50 @@ export const SearchInputForm = ({
   autocompleteResults,
   searchBoxPlaceholder,
   focusedOptionId,
-  isDirty,
+  shouldShowAutocomplete,
   focusedIndex,
   onKeyDown,
   onAutocompleteSelect,
   onSearchInputChange,
   onSearchSubmit,
-  searchInputDataTestId,
+  onSearchInputFocus,
+  onSearchInputBlur,
 }: SearchInputFormProps) => {
-  const { searchInputIconColor } = searchInputVariantClasses[searchInputVariant];
+  const { autocompleteIconColor } = searchInputVariantClasses[searchInputVariant];
+
+  const containerClasses = classNames(
+    'spiffy-tw-relative',
+    'spiffy-tw-w-full'
+  );
+
+  const formClasses = classNames({
+    'spiffy-tw-grow': true,
+    'spiffy-tw-relative': true,
+    'spiffy-tw-z-20': shouldShowAutocomplete
+  });
+
+  const autocompleteContainerClasses = classNames(
+    'spiffy-tw-absolute',
+    'spiffy-tw-top-1/2',
+    'spiffy-tw-z-10',
+    'spiffy-tw-left-0',
+    'spiffy-tw-right-0',
+    'spiffy-tw-bg-white',
+    'spiffy-tw-w-full',
+    'spiffy-tw-rounded-b-lg',
+    'spiffy-tw-border',
+    'spiffy-tw-border-t-0',
+    'spiffy-tw-pt-4'
+  );
 
   return (
-    <>
+    <div className={containerClasses}>
       <form
         onSubmit={(e) => {
           e.preventDefault();
           onSearchSubmit();
         }}
-        className="spiffy-tw-grow"
+        className={formClasses}
       >
         <SearchInput
           value={searchText}
@@ -49,20 +78,25 @@ export const SearchInputForm = ({
           suggestions={autocompleteResults}
           ariaActivedescendant={focusedOptionId}
           searchInputVariant={searchInputVariant}
-          dataTestId={searchInputDataTestId}
+          dataTestId={SEARCH_INPUT_TESTID}
           onKeyDown={onKeyDown}
           onChange={onSearchInputChange}
+          onFocus={onSearchInputFocus}
+          onBlur={onSearchInputBlur}
         />
       </form>
-      {isDirty && (
-        <SearchAutocomplete
-          id="autocomplete-results"
-          results={autocompleteResults}
-          focusedIndex={focusedIndex}
-          iconColor={searchInputIconColor}
-          onSuggestionSelect={onAutocompleteSelect}
-        />
+      {shouldShowAutocomplete && (
+        <div className={autocompleteContainerClasses}>
+          <SearchAutocomplete
+            id="autocomplete-results"
+            results={autocompleteResults}
+            focusedIndex={focusedIndex}
+            searchText={searchText}
+            iconColor={autocompleteIconColor}
+            onSuggestionSelect={onAutocompleteSelect}
+          />
+        </div>
       )}
-    </>
+    </div>
   );
 };

package/src/components/SuggestionButton/SuggestionButton.tsx

@@ -105,6 +105,20 @@ const variantClassMap = new Map<SuggestionButtonVariant, string[]>([
       BORDER_CLASS,
     ],
   ],
+  // dark accent appears to have been originally been made with the bg color text-accent
+  // instead of the design, acccent-primary. This is a correction to match the design without
+  // regressing intentional uses of the other styling. text-accent and accent-primary are often
+  // the same or very similar colors but in some cases, they are very different to deal with contrast correctly.
+  [
+    'darkAccentContrast',
+    [
+      ...DARK_BACKGROUND_CLASSES,
+      'spiffy-tw-text-[--spiffy-colors-text-light]', // hover:spiffy-tw-text-[--spiffy-colors-text-light]
+      'spiffy-tw-fill-[--spiffy-colors-accent-primary]', // hover:spiffy-tw-fill-[--spiffy-colors-accent-primary]
+      'spiffy-tw-stroke-[--spiffy-colors-accent-primary]', // hover:spiffy-tw-stroke-[--spiffy-colors-accent-primary]
+      BORDER_CLASS,
+    ],
+  ],
   [
     'transparent',
     [
@@ -169,6 +183,7 @@ const borderedVariants = [
   'tertiary',
   'dark',
   'darkAccent',
+  'darkAccentContrast',
   'darkPrimary',
   'transparent',
   'transparentDark',

package/src/components/SuggestionButton/types.ts

@@ -6,9 +6,10 @@ export type SuggestionButtonVariant =
   | 'tertiary'
   | 'dark'
   | 'darkAccent'
+  | 'darkAccentContrast'
   | 'darkPrimary'
   | 'secondaryDark'
   | 'secondaryAccent'
   | 'transparent'
   | 'transparentDark'
-  | 'lightDark';
+  | 'lightDark';

package/dist/SearchAutocomplete-obO19yzL.js

@@ -1,51 +0,0 @@
-import { motion } from "framer-motion";
-import React from "react";
-import classNames from "classnames";
-import { jsx, jsxs } from "react/jsx-runtime";
-import OutlinedStar from "@envive-ai/react-icons/OutlinedStar";
-
-//#region src/components/SearchAutocomplete/SearchAutocomplete.tsx
-const SearchAutocomplete = ({ id, results, focusedIndex, onSuggestionSelect, iconColor }) => {
-	if (results.length === 0) return null;
-	return /* @__PURE__ */ jsx(motion.div, {
-		className: "spiffy-tw-h-full",
-		initial: {
-			opacity: 0,
-			y: -10
-		},
-		animate: {
-			opacity: 1,
-			y: 0
-		},
-		exit: {
-			opacity: 0,
-			y: -10
-		},
-		transition: { duration: .2 },
-		children: /* @__PURE__ */ jsx("ul", {
-			id,
-			role: "listbox",
-			className: "spiffy-tw-mt-4 spiffy-tw-space-y-2",
-			children: results.map((result, index) => /* @__PURE__ */ jsxs("li", {
-				id: `option-${index}`,
-				role: "option",
-				"aria-selected": index === focusedIndex,
-				className: classNames("spiffy-tw-flex spiffy-tw-items-center spiffy-tw-cursor-pointer spiffy-tw-py-1", { "spiffy-tw-bg-neutral-200": index === focusedIndex }, "hover:spiffy-tw-bg-neutral-100"),
-				onClick: () => onSuggestionSelect(result, index),
-				onKeyDown: (event) => {
-					if (event.key === "Enter" || event.keyCode === 13) onSuggestionSelect(result, index);
-				},
-				children: [/* @__PURE__ */ jsx(OutlinedStar, {
-					className: "spiffy-tw-w-[16px] spiffy-tw-h-[16px] spiffy-tw-mr-2",
-					fill: iconColor
-				}), /* @__PURE__ */ jsx("span", {
-					className: "spiffy-tw-font-bold",
-					children: result
-				})]
-			}, index))
-		})
-	});
-};
-
-//#endregion
-export { SearchAutocomplete };