@transferwise/components 0.0.0-experimental-58e9ef8 → 0.0.0-experimental-791acf3

package/src/inputs/SelectInput.tsx

@@ -741,15 +741,35 @@ function SelectInputOptions<T = string>({
       return items;
     }
 
-    const filtered = filterSelectInputItems(dedupeSelectInputItems(items, compareValues), (item) =>
-      selectInputOptionItemIncludesNeedle(item, needle),
-    );
+    const dedupedItems = dedupeSelectInputItems(items, compareValues);
 
     if (sortFilteredOptions) {
+      // When sorting, filter out non-matching items completely to avoid ghost items
+      const filtered = dedupedItems.map((item) => {
+        if (item.type === 'option') {
+          return selectInputOptionItemIncludesNeedle(item, needle)
+            ? item
+            : { ...item, value: undefined };
+        }
+        if (item.type === 'group') {
+          return {
+            ...item,
+            options: item.options.map((option) =>
+              selectInputOptionItemIncludesNeedle(option, needle)
+                ? option
+                : { ...option, value: undefined },
+            ),
+          };
+        }
+        return item;
+      });
+
       return sortSelectInputItems(filtered, sortFilteredOptions, filterQuery);
     }
 
-    return filtered;
+    return filterSelectInputItems(dedupedItems, (item) =>
+      selectInputOptionItemIncludesNeedle(item, needle),
+    );
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [needle, items, compareValues]);
   const resultsEmpty = needle != null && filteredItems.length === 0;
@@ -760,17 +780,28 @@ function SelectInputOptions<T = string>({
   // the scroll position may jump around inadvertently. Pattern adopted from:
   // https://inokawa.github.io/virtua/?path=/story/advanced-keep-offscreen-items--append-only
   const [mountedIndexes, setMountedIndexes] = useState<number[]>([]);
+
+  // Track if this is the initial render after a search change
+  const isInitialSearchRender = useRef(true);
+
   useEffect(() => {
-    // Ensure the 'End' key works as intended by keeping the last item mounted
-    setMountedIndexes((prevMountedIndexes) => {
-      const indexes = new Set(prevMountedIndexes);
-      indexes.add(filteredItems.length - 1);
-      return [...indexes]; // Sorting is redundant by nature here
-    });
-  }, [
-    needle, // Needed as `filteredItems.length` may be equal between two updates
-    filteredItems.length,
-  ]);
+    // Reset mounted indexes and flag when search changes
+    setMountedIndexes([]);
+    isInitialSearchRender.current = true;
+  }, [needle]);
+
+  useEffect(() => {
+    // Only add the last item to mountedIndexes after the initial render
+    // This prevents auto-scrolling on search while still supporting the 'End' key
+    if (!isInitialSearchRender.current && filteredItems.length > 0) {
+      setMountedIndexes((prevMountedIndexes) => {
+        const indexes = new Set(prevMountedIndexes);
+        indexes.add(filteredItems.length - 1);
+        return [...indexes]; // Sorting is redundant by nature here
+      });
+    }
+    isInitialSearchRender.current = false;
+  }, [filteredItems.length]);
 
   const listboxContainerRef = useRef<HTMLDivElement>(null);
   useEffect(() => {
@@ -927,7 +958,6 @@ function SelectInputOptions<T = string>({
           ) : (
             <Virtualizer
               ref={virtualiserHandlerRef}
-              key={needle}
               data={filteredItems}
               keepMounted={mountedIndexes}
               scrollRef={listboxRef} // `VList` doesn't expose this

package/src/inputs/_BottomSheet.less

@@ -11,8 +11,6 @@
   transition-property: opacity;
   transition-timing-function: ease-out;
   transition-duration: 300ms;
-  height: 100vh;
-  min-height: -webkit-fill-available;
 
   &--closed {
     opacity: 0;
@@ -21,28 +19,24 @@
 
 .np-bottom-sheet-v2 {
   position: fixed;
-  inset: 0;
+  inset: 0px;
   bottom: env(keyboard-inset-height, 0px);
-  // margin-left: var(--size-8);
-  // margin-right: var(--size-8);
-  padding-top: var(--size-64);
-  padding-bottom: min(env(safe-area-inset-bottom, var(--size-16)));
+  margin-left: var(--size-8);
+  margin-right: var(--size-8);
+  margin-top: var(--size-64);
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
-  height: 100%;
-  min-height: -webkit-fill-available;
 }
 
 .np-bottom-sheet-v2-content {
   display: flex;
   flex-direction: column;
   overflow: auto;
-  border-top-left-radius: var(--size-32);
-  border-top-right-radius: var(--size-32);
+  border-top-left-radius: 32px; /* TODO: Tokenize */
+  border-top-right-radius: 32px; /* TODO: Tokenize */
   background-color: var(--color-background-elevated);
   box-shadow: 0 0 40px rgb(69 71 69 / 0.2);
-  will-change: transform;
 
   &:focus {
     outline: none;

package/src/inputs/_BottomSheet.tsx

@@ -10,11 +10,12 @@ import { Transition, TransitionChild } from '@headlessui/react';
 import { FocusScope } from '@react-aria/focus';
 import { ThemeProvider, useTheme } from '@wise/components-theming';
 import { clsx } from 'clsx';
-import { Fragment, useState, useEffect } from 'react';
+import { Fragment, useState } from 'react';
 
-import { CloseButton, Size } from '../common';
+import { CloseButton } from '../common/closeButton';
 import { useVirtualKeyboard } from '../common/hooks/useVirtualKeyboard';
 import { PreventScroll } from '../common/preventScroll/PreventScroll';
+import { Size } from '../common/propsValues/size';
 
 export interface BottomSheetProps {
   open: boolean;
@@ -32,19 +33,6 @@ export interface BottomSheetProps {
   onCloseEnd?: () => void;
 }
 
-/**
- * App pages set scroll-behavior to 'smooth' which causes mobile Safari to
- * slow-scroll and glitch. This function temporarily disables that behaviour
- * while the BottomSheet is open.
- */
-const freezeScroll = (shouldFreeze = true) => {
-  if (shouldFreeze) {
-    document.documentElement.style.scrollBehavior = 'unset';
-  } else {
-    document.documentElement.style.removeProperty('scroll-behavior');
-  }
-};
-
 export function BottomSheet({
   open,
   renderTrigger,
@@ -66,14 +54,12 @@ export function BottomSheet({
     },
   });
 
-  useEffect(() => {
-    freezeScroll(open);
-  }, [open]);
-
   const dismiss = useDismiss(context);
   const role = useRole(context);
   const { getReferenceProps, getFloatingProps } = useInteractions([dismiss, role]);
+
   const [floatingKey, setFloatingKey] = useState(0);
+
   const { theme, screenMode } = useTheme();
 
   return (

package/src/main.css

@@ -2574,7 +2574,6 @@ button.np-option {
 }
 .no-scroll {
   overflow: hidden;
-  scroll-behavior: unset;
 }
 .dimmer {
   position: fixed;
@@ -3840,38 +3839,35 @@ html:not([dir="rtl"]) .np-flow-navigation--sm .np-flow-navigation__stepper {
   transition-property: opacity;
   transition-timing-function: ease-out;
   transition-duration: 300ms;
-  height: 100vh;
-  min-height: -webkit-fill-available;
 }
 .np-bottom-sheet-v2-backdrop--closed {
   opacity: 0;
 }
 .np-bottom-sheet-v2 {
   position: fixed;
-  inset: 0;
+  inset: 0px;
   bottom: env(keyboard-inset-height, 0px);
-  padding-top: 64px;
-  padding-top: var(--size-64);
-  padding-bottom: min(env(safe-area-inset-bottom, 16px));
-  padding-bottom: min(env(safe-area-inset-bottom, var(--size-16)));
+  margin-left: 8px;
+  margin-left: var(--size-8);
+  margin-right: 8px;
+  margin-right: var(--size-8);
+  margin-top: 64px;
+  margin-top: var(--size-64);
   display: flex;
   flex-direction: column;
   justify-content: flex-end;
-  height: 100%;
-  min-height: -webkit-fill-available;
 }
 .np-bottom-sheet-v2-content {
   display: flex;
   flex-direction: column;
   overflow: auto;
   border-top-left-radius: 32px;
-  border-top-left-radius: var(--size-32);
+  /* TODO: Tokenize */
   border-top-right-radius: 32px;
-  border-top-right-radius: var(--size-32);
+  /* TODO: Tokenize */
   background-color: #ffffff;
   background-color: var(--color-background-elevated);
   box-shadow: 0 0 40px rgba(69, 71, 69, 0.2);
-  will-change: transform;
 }
 .np-bottom-sheet-v2-content:focus {
   outline: none;

package/src/slidingPanel/SlidingPanel.tsx

@@ -3,7 +3,6 @@ import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { CSSTransition } from 'react-transition-group';
 
 import { Position } from '../common';
-import { PreventScroll } from '../common/preventScroll/PreventScroll';
 
 export const EXIT_ANIMATION = 350;
 
@@ -34,35 +33,31 @@ const SlidingPanel = forwardRef(
     useImperativeHandle(reference, () => localReference.current, []);
 
     return (
-      <>
-        {open ? <PreventScroll /> : null}
-
-        <CSSTransition
-          {...rest}
-          key={`sliding-panel--open-${position}`}
-          nodeRef={localReference}
-          in={open}
-          // Wait for animation to finish before unmount.
-          timeout={{ enter: 0, exit: EXIT_ANIMATION }}
-          classNames="sliding-panel"
-          appear
-          unmountOnExit
+      <CSSTransition
+        {...rest}
+        key={`sliding-panel--open-${position}`}
+        nodeRef={localReference}
+        in={open}
+        // Wait for animation to finish before unmount.
+        timeout={{ enter: 0, exit: EXIT_ANIMATION }}
+        classNames="sliding-panel"
+        appear
+        unmountOnExit
+      >
+        <div
+          ref={localReference}
+          data-testid={testId}
+          className={clsx(
+            'sliding-panel',
+            `sliding-panel--open-${position}`,
+            showSlidingPanelBorder && `sliding-panel--border-${position}`,
+            slidingPanelPositionFixed && 'sliding-panel--fixed',
+            className,
+          )}
         >
-          <div
-            ref={localReference}
-            data-testid={testId}
-            className={clsx(
-              'sliding-panel',
-              `sliding-panel--open-${position}`,
-              showSlidingPanelBorder && `sliding-panel--border-${position}`,
-              slidingPanelPositionFixed && 'sliding-panel--fixed',
-              className,
-            )}
-          >
-            {children}
-          </div>
-        </CSSTransition>
-      </>
+          {children}
+        </div>
+      </CSSTransition>
     );
   },
 );

package/src/common/bottomSheet/BottomSheet.test.story.tsx

@@ -1,94 +0,0 @@
-import { useState } from 'react';
-import { Meta, StoryObj } from '@storybook/react-webpack5';
-import { userEvent, within } from 'storybook/test';
-import { lorem100, lorem500 } from '../../test-utils';
-import { Typography } from '../propsValues/typography';
-import Alert from '../../alert';
-import Body from '../../body';
-import Button from '../../button';
-import Title from '../../title';
-import BottomSheet from './BottomSheet';
-
-const wait = async (duration = 500) =>
-  new Promise<void>((resolve) => {
-    setTimeout(resolve, duration);
-  });
-
-export default {
-  component: BottomSheet,
-  title: 'Dialogs/BottomSheet/tests',
-  tags: ['!autodocs'],
-  args: {
-    open: false,
-  },
-} satisfies Meta<typeof BottomSheet>;
-
-type Story = StoryObj<typeof BottomSheet>;
-
-/**
- * This test ensures that when the SelectInput is used within a scrollable page,
- * opening the dropdown does not cause any unwanted scrolling or layout shifts.
- * Expected preview should start with green bar at the top, with yellow section
- * not in the viewport.
- *
- * NB: This test is disabled in Chromatic as there's no obvious way to control <html/> element of a snapshot.
- */
-export const SmoothScrollReset: Story = {
-  args: {
-    children: (
-      <>
-        <Title type={Typography.TITLE_SECTION}>Observe the document</Title>
-        <Alert className="m-t-2" type="warning">
-          Once the <code>BottomSheet</code> opens, the document underneath should be static and
-          should not scroll.
-        </Alert>
-        <Body as="p">{lorem100}</Body>
-        <Body as="p">{lorem100}</Body>
-      </>
-    ),
-  },
-  decorators: [
-    (Story) => (
-      <>
-        <style>{'html { scroll-behavior: smooth; }'}</style>
-        <div style={{ maxWidth: 500 }}>
-          <Body>
-            <p>{lorem100}</p>
-            <p>{lorem100}</p>
-          </Body>
-          <Story />
-          <Body as="p" className="m-t-5 disabled">
-            {lorem500}
-          </Body>
-        </div>
-      </>
-    ),
-  ],
-  parameters: {
-    chromatic: {
-      disableSnapshot: true,
-    },
-  },
-  play: async ({ canvasElement }) => {
-    document.documentElement.scrollTop = 400;
-    await wait(500);
-    const canvas = within(canvasElement);
-    await userEvent.click(canvas.getByRole('button'));
-  },
-  render: ({ open, ...args }) => {
-    const [isOpen, setIsOpen] = useState(false);
-
-    return (
-      <div>
-        <Button onClick={() => setIsOpen(true)}>Open BottomSheet</Button>
-        <BottomSheet
-          {...args}
-          open={isOpen}
-          onClose={() => {
-            setIsOpen(false);
-          }}
-        />
-      </div>
-    );
-  },
-};

package/src/inputs/SelectInput.test.story.tsx

@@ -1,83 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react-webpack5';
-import { fn, type Mock, userEvent, within } from 'storybook/test';
-import { allModes } from '../../.storybook/modes';
-import { lorem5, lorem500 } from '../test-utils';
-import { Field } from '../field/Field';
-import Body from '../body';
-import { SelectInput, type SelectInputProps } from './SelectInput';
-
-const meta = {
-  title: 'Forms/SelectInput/tests',
-  component: SelectInput,
-  args: {
-    onFilterChange: fn() satisfies Mock,
-    onChange: fn() satisfies Mock,
-    onClose: fn() satisfies Mock,
-    onOpen: fn() satisfies Mock,
-  },
-  tags: ['!autodocs'],
-} satisfies Meta<typeof SelectInput>;
-export default meta;
-
-type Story<T, M extends boolean = false> = StoryObj<SelectInputProps<T, M>>;
-
-const wait = async (duration = 500) =>
-  new Promise<void>((resolve) => {
-    setTimeout(resolve, duration);
-  });
-
-/**
- * This test ensures that when the SelectInput is used within a scrollable page,
- * opening the dropdown does not cause any unwanted scrolling or layout shifts.
- * Expected preview should start with green bar at the top, with yellow section
- * not in the viewport.
- *
- * NB: This test is disabled in Chromatic as there's no obvious way to control <html/> element of a snapshot.
- */
-export const SmoothScrollReset: Story<string> = {
-  args: {
-    items: Array.from({ length: 15 }).map((_, id) => ({
-      type: 'option',
-      value: `option ${id + 1}`,
-    })),
-    placeholder: 'Select option',
-  },
-  decorators: [
-    (Story) => (
-      <>
-        <style>{`html { scroll-behavior: smooth; }`}</style>
-        <div>
-          <div
-            className="d-flex align-items-center justify-content-center"
-            style={{
-              backgroundColor: 'var(--color-bright-yellow)',
-              height: 400,
-            }}
-          >
-            This block should not be in the viewport.
-          </div>
-          <div style={{ height: 10, backgroundColor: 'var(--color-bright-green)' }} />
-          <Field id="el1" label={lorem5}>
-            <Story />
-          </Field>
-          <Body as="p">{lorem500}</Body>
-        </div>
-      </>
-    ),
-  ],
-  play: async ({ canvasElement }) => {
-    document.documentElement.scrollTop = 400;
-    await wait();
-    const canvas = within(canvasElement);
-    const triggerButton = canvas.getByRole('combobox');
-    await userEvent.click(triggerButton);
-  },
-  globals: {
-    viewport: { value: allModes.largeMobile.viewport, isRotated: false },
-  },
-  parameters: {
-    chromatic: {
-      disableSnapshot: true,
-    },
-  },
-};

package/src/moneyInput/MoneyInput.test.story.tsx

@@ -1,101 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react-webpack5';
-import { fn, type Mock, userEvent, within } from 'storybook/test';
-import { allModes } from '../../.storybook/modes';
-import { lorem500 } from '../test-utils';
-import { Field } from '../field/Field';
-import Body from '../body';
-import MoneyInput from './MoneyInput';
-
-const meta = {
-  title: 'Forms/MoneyInput/tests',
-  component: MoneyInput,
-  args: {
-    amount: 1000,
-    id: 'moneyInput',
-    currencies: [
-      {
-        value: 'EUR',
-        label: 'EUR',
-        note: 'Euro',
-        currency: 'eur',
-        searchable: 'Spain, Germany, France, Austria',
-      },
-      {
-        value: 'GBP',
-        label: 'GBP',
-        note: 'British pound',
-        currency: 'gbp',
-        searchable: 'England, Scotland, Wales',
-      },
-    ],
-    selectedCurrency: {
-      value: 'EUR',
-      label: 'EUR',
-      note: 'Euro',
-      currency: 'eur',
-      searchable: 'Spain, Germany, France, Austria',
-    },
-    searchPlaceholder: '',
-    onAmountChange: () => {},
-    onCurrencyChange: () => {},
-  },
-  tags: ['!autodocs'],
-} satisfies Meta<typeof MoneyInput>;
-export default meta;
-
-type Story = StoryObj<typeof MoneyInput>;
-
-const wait = async (duration = 500) =>
-  new Promise<void>((resolve) => {
-    setTimeout(resolve, duration);
-  });
-
-/**
- * This test ensures that when the SelectInput is used within a scrollable page,
- * opening the dropdown does not cause any unwanted scrolling or layout shifts.
- * Expected preview should start with green bar at the top, with yellow section
- * not in the viewport.
- *
- * NB: This test is disabled in Chromatic as there's no obvious way to control <html/> element of a snapshot.
- */
-export const SmoothScrollReset: Story = {
-  decorators: [
-    (Story) => (
-      <>
-        <style>{`html { scroll-behavior: smooth; }`}</style>
-        <div>
-          <div
-            className="d-flex align-items-center justify-content-center"
-            style={{
-              backgroundColor: 'var(--color-bright-yellow)',
-              height: 400,
-            }}
-          >
-            This block should not be in the viewport.
-          </div>
-          <div style={{ height: 10, backgroundColor: 'var(--color-bright-green)' }} />
-          <Field id="el1" label="Select currency">
-            <Story />
-          </Field>
-          <Body as="p">{lorem500}</Body>
-        </div>
-      </>
-    ),
-  ],
-  play: async ({ canvasElement }) => {
-    await wait(2000);
-    document.documentElement.scrollTop = 400;
-    await wait(2000);
-    const canvas = within(canvasElement);
-    const triggerButton = canvas.getByRole('combobox');
-    await userEvent.click(triggerButton);
-  },
-  globals: {
-    viewport: { value: allModes.largeMobile.viewport, isRotated: false },
-  },
-  parameters: {
-    chromatic: {
-      disableSnapshot: true,
-    },
-  },
-};