@digigov/ui 2.0.0-113e6661 → 2.0.0-2177f152

package/src/form/AutoComplete/index.test.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { test, expect } from '@playwright/experimental-ct-react';
-import TestVariant from '@digigov/ui/utils/TestVariant'
 import { Default } from '@digigov/ui/form/AutoComplete/__stories__/Default';
 import { Multiple } from '@digigov/ui/form/AutoComplete/__stories__/Multiple';
 import { MultipleShowingTwoSelected } from '@digigov/ui/form/AutoComplete/__stories__/MultipleShowingTwoSelected';
@@ -11,46 +10,48 @@ import { WithDefaultValue } from '@digigov/ui/form/AutoComplete/__stories__/With
 import { WithMinLength } from '@digigov/ui/form/AutoComplete/__stories__/WithMinLength';
 import { WithPlaceHolder } from '@digigov/ui/form/AutoComplete/__stories__/WithPlaceHolder';
 import { WithShowAllValues } from '@digigov/ui/form/AutoComplete/__stories__/WithShowAllValues';
+import TestVariant from '@digigov/ui/utils/TestVariant';
 
 test('renders the All AutoComplete variants', async ({ mount, page }) => {
   await mount(
-    
-  <div>
-    <TestVariant title="Default">
-      <Default />
-    </TestVariant>
-    <TestVariant title="Multiple">
-      <Multiple />
-    </TestVariant>
-    <TestVariant title="MultipleShowingTwoSelected">
-      <MultipleShowingTwoSelected />
-    </TestVariant>
-    <TestVariant title="MultipleWithDefaultValues">
-      <MultipleWithDefaultValues />
-    </TestVariant>
-    <TestVariant title="MultipleWithMinLength">
-      <MultipleWithMinLength />
-    </TestVariant>
-    <TestVariant title="WithAutoSelect">
-      <WithAutoSelect />
-    </TestVariant>
-    <TestVariant title="WithDefaultValue">
-      <WithDefaultValue />
-    </TestVariant>
-    <TestVariant title="WithMinLength">
-      <WithMinLength />
-    </TestVariant>
-    <TestVariant title="WithPlaceHolder">
-      <WithPlaceHolder />
-    </TestVariant>
-    <TestVariant title="WithShowAllValues">
-      <WithShowAllValues />
-    </TestVariant>
-  </div>
-  )
+    <div>
+      <TestVariant title="Default">
+        <Default />
+      </TestVariant>
+      <TestVariant title="Multiple">
+        <Multiple />
+      </TestVariant>
+      <TestVariant title="MultipleShowingTwoSelected">
+        <MultipleShowingTwoSelected />
+      </TestVariant>
+      <TestVariant title="MultipleWithDefaultValues">
+        <MultipleWithDefaultValues />
+      </TestVariant>
+      <TestVariant title="MultipleWithMinLength">
+        <MultipleWithMinLength />
+      </TestVariant>
+      <TestVariant title="WithAutoSelect">
+        <WithAutoSelect />
+      </TestVariant>
+      <TestVariant title="WithDefaultValue">
+        <WithDefaultValue />
+      </TestVariant>
+      <TestVariant title="WithMinLength">
+        <WithMinLength />
+      </TestVariant>
+      <TestVariant title="WithPlaceHolder">
+        <WithPlaceHolder />
+      </TestVariant>
+      <TestVariant title="WithShowAllValues">
+        <WithShowAllValues />
+      </TestVariant>
+    </div>
+  );
   await page.evaluate(() => document.fonts.ready);
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  

package/src/form/AutoComplete/index.tsx

@@ -1,24 +1,23 @@
-import React from 'react';
-import { Component } from 'react';
-import AutoCompleteAssistiveHint from '@digigov/react-core/AutoCompleteAssistiveHint';
-import AutoCompleteInput from '@digigov/react-core/AutoCompleteInput';
-import AutoCompleteInputTypeahead from '@digigov/react-core/AutoCompleteInputTypeahead';
-import AutoCompleteResultList from '@digigov/react-core/AutoCompleteResultList';
-import AutoCompleteResultListItem from '@digigov/react-core/AutoCompleteResultListItem';
-import AutoCompleteContainer from '@digigov/react-core/AutoCompleteContainer';
-import AutoCompleteMultipleInputContainer from '@digigov/react-core/AutoCompleteMultipleInputContainer';
-import AutoCompleteMultipleInput from '@digigov/react-core/AutoCompleteMultipleInput';
+import React, { Component } from 'react';
+import { AutoCompleteAssistiveHint } from '@digigov/react-core/AutoCompleteAssistiveHint';
+import { AutoCompleteContainer } from '@digigov/react-core/AutoCompleteContainer';
+import { AutoCompleteInputBase } from '@digigov/react-core/AutoCompleteInputBase';
+import { AutoCompleteInputTypeahead } from '@digigov/react-core/AutoCompleteInputTypeahead';
+import { AutoCompleteMultipleInput } from '@digigov/react-core/AutoCompleteMultipleInput';
+import { AutoCompleteMultipleInputContainer } from '@digigov/react-core/AutoCompleteMultipleInputContainer';
+import { AutoCompleteResultList } from '@digigov/react-core/AutoCompleteResultList';
+import { AutoCompleteResultListItem } from '@digigov/react-core/AutoCompleteResultListItem';
 import { Base } from '@digigov/react-core/Base';
 import { CaretIcon } from '@digigov/react-icons/CaretIcon';
+import { Chip, ChipContainer } from '@digigov/ui/content/Chip';
 import Status from '@digigov/ui/form/AutoComplete/Status';
 import {
   isIosDevice,
   keyCodes,
   isPrintableKeyCode,
 } from '@digigov/ui/form/AutoComplete/utils';
-import Checkbox, { CheckboxItem } from '../Checkbox';
-import { Chip, ChipContainer } from '@digigov/ui/content/Chip';
 import Button from '@digigov/ui/form/Button';
+import Checkbox, { CheckboxItem } from '@digigov/ui/form/Checkbox';
 import { NormalText } from '@digigov/ui/typography/NormalText';
 
 export interface AutoCompleteProps {
@@ -47,7 +46,7 @@ export interface AutoCompleteProps {
   numberOfSelected?: 1 | 2 | 3 | 'all';
 }
 
-export type State = {
+export interface State {
   focused: any;
   hovered: any;
   menuOpen: boolean;
@@ -57,9 +56,12 @@ export type State = {
   validChoiceMade: boolean;
   selected: any;
   ariaHint: boolean;
-};
+}
 
-export type NewQueryProps = { menuOpen?: boolean; query?: string };
+export interface NewQueryProps {
+  menuOpen?: boolean;
+  query?: string;
+}
 
 export default class AutoComplete extends Component<AutoCompleteProps, State> {
   static defaultProps = {
@@ -136,7 +138,6 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
 
   componentDidMount(): void {
     this.getDirectInputChanges();
-
   }
 
   getDirectInputChanges(): void {
@@ -473,21 +474,32 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
         break;
       case 'backspace':
         if (this.props.multiple) {
-          if (this.state.query.length === 0 && this.state.selectedValues.length > 0) {
+          if (
+            this.state.query.length === 0 &&
+            this.state.selectedValues.length > 0
+          ) {
             event.preventDefault();
-            const updatedSelectedValues = this.state.selectedValues.slice(0, -1);
-            this.setState({
-              selectedValues: updatedSelectedValues,
-            }, () => {
-              this.props.onConfirm?.(updatedSelectedValues);
-            });
-            break;
+            const updatedSelectedValues = this.state.selectedValues.slice(
+              0,
+              -1
+            );
+            this.setState(
+              {
+                selectedValues: updatedSelectedValues,
+              },
+              () => {
+                this.props.onConfirm?.(updatedSelectedValues);
+              }
+            );
+          } else {
+            if (isPrintableKeyCode(event.keyCode)) {
+              this.handlePrintableKey(event);
+            }
           }
-        }
-        else {
+        } else {
           this.props.onConfirm?.('');
-          break;
         }
+        break;
       default:
         if (isPrintableKeyCode(event.keyCode)) {
           this.handlePrintableKey(event);
@@ -545,8 +557,8 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
     const assistiveHintID = id + '__assistiveHint';
     const ariaDescribedProp = ariaHint
       ? {
-        'aria-describedby': assistiveHintID,
-      }
+          'aria-describedby': assistiveHintID,
+        }
       : null;
 
     const showAutoCompleteResultListItems = (
@@ -558,7 +570,8 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
           const showFocused =
             focused === -1 ? selected === index : focused === index;
           const iosPosinsetHtml = isIosDevice() ? (
-            <Base as='span'
+            <Base
+              as="span"
               id={`${id}__option-suffix--${index}`}
               style={{
                 border: '0',
@@ -603,7 +616,7 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
                 <CheckboxItem
                   value={option}
                   checked={this.state.selectedValues.includes(option)}
-                  onChange={() => { }}
+                  onChange={() => {}}
                 >
                   {this.templateSuggestion(option)}
                 </CheckboxItem>
@@ -649,29 +662,32 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
                   <Chip
                     key={index}
                     onDelete={() => {
-                      this.setState(prevState => ({
-                        selectedValues: prevState.selectedValues.filter(
-                          (v) => {
-                            if (typeof v === "string") {
-                              return v !== value;
-                            } else {
-                              return v.value !== value.value;
+                      this.setState(
+                        (prevState) => ({
+                          selectedValues: prevState.selectedValues.filter(
+                            (v) => {
+                              if (typeof v === 'string') {
+                                return v !== value;
+                              } else {
+                                return v.value !== value.value;
+                              }
                             }
-                          }
-                        ),
-                      }), () => {
-                        this.props.onConfirm?.(this.state.selectedValues);
-                      });
+                          ),
+                        }),
+                        () => {
+                          this.props.onConfirm?.(this.state.selectedValues);
+                        }
+                      );
                     }}
                   >
-                    {typeof value === "string" ? value : value.label.primary}
+                    {typeof value === 'string' ? value : value.label.primary}
                   </Chip>
                 );
               })}
               {!componentIsFocused &&
                 typeof this.props.numberOfSelected === 'number' &&
                 this.state.selectedValues.length >
-                this.props.numberOfSelected && (
+                  this.props.numberOfSelected && (
                   <NormalText fontWeight="bold" margin={0}>
                     +
                     {this.state.selectedValues.length -
@@ -755,7 +771,7 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
           </AutoCompleteMultipleInputContainer>
         ) : (
           <>
-            <AutoCompleteInput
+            <AutoCompleteInputBase
               aria-expanded={menuOpen ? 'true' : 'false'}
               aria-activedescendant={
                 optionFocused ? `${id}__option--${focused}` : ''
@@ -806,7 +822,7 @@ export default class AutoComplete extends Component<AutoCompleteProps, State> {
 
 export {
   AutoComplete,
-  AutoCompleteInput,
+  AutoCompleteInputBase,
   AutoCompleteInputTypeahead,
   AutoCompleteResultList,
   AutoCompleteResultListItem,

package/src/form/AutoComplete/interaction.test.tsx

@@ -4,15 +4,23 @@ import { test, expect } from '@playwright/experimental-ct-react';
 import { Multiple } from '@digigov/ui/form/AutoComplete/__stories__/Multiple';
 
 test('renders the Multiple show chip', async ({ mount, page }) => {
-  await mount(
-    <Multiple />
-  )
+  await mount(<Multiple />);
   await page.evaluate(() => document.fonts.ready);
- await page.locator("#root>div>div>fieldset>div>div:nth-child(2)>button").click();
- await page.locator("#root>div>div>fieldset>div>div:nth-child(2)>ul:nth-child(4)>div>li:nth-child(3)").click();
- await page.locator("#root>div>div>fieldset>div>div:nth-child(2)>button").click();
+  await page
+    .locator('#root>div>div>fieldset>div>div:nth-child(2)>button')
+    .click();
+  await page
+    .locator(
+      '#root>div>div>fieldset>div>div:nth-child(2)>ul:nth-child(4)>div>li:nth-child(3)'
+    )
+    .click();
+  await page
+    .locator('#root>div>div>fieldset>div>div:nth-child(2)>button')
+    .click();
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  

package/src/form/Button/__snapshots__/index.spec.tsx.snap

@@ -1,17 +1,13 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`renders the button 1`] = `
-<ForwardRef(Button)>
-  <ForwardRef(Base)
-    as="button"
-    className="ds-btn-primary ds-btn"
-    printHidden={true}
-  >
+<body>
+  <div>
     <button
-      className="ds-btn-primary ds-btn ds-print-hidden"
+      class="ds-print-hidden ds-btn ds-btn-primary"
     >
       hello
     </button>
-  </ForwardRef(Base)>
-</ForwardRef(Button)>
+  </div>
+</body>
 `;

package/src/form/Button/{index.mdx → doc.mdx}

@@ -14,57 +14,41 @@ application or saving their information.
 
 Use a default button for the main call to action on a page.
 
-<Story packageName="@digigov/ui" component="form/Button" story="Primary.tsx" />
+<code src="@digigov/ui/form/Button/__stories__/Primary.tsx" />
 
 ### Start buttons
 
 Use a start button for the main call to action on your service’s start page. Start buttons do not submit form data, so they use a link tag rather than a button tag.
 
-<Story
-  packageName="@digigov/ui"
-  component="form/Button"
-  story="CallToActionButton.tsx"
-/>
+<code src="@digigov/ui/form/Button/__stories__/CallToActionButton.tsx" />
 
 ### Secondary buttons
 
 Use secondary buttons for secondary calls to action on a page.
 
-<Story
-  packageName="@digigov/ui"
-  component="form/Button"
-  story="Secondary.tsx"
-/>
+<code src="@digigov/ui/form/Button/__stories__/Secondary.tsx" />
 
 ### Warning buttons
 
 Warning buttons are designed to make users think carefully before they use them. They only work if used very sparingly. Most services should not need one.
 
-<Story packageName="@digigov/ui" component="form/Button" story="Warning.tsx" />
+<code src="@digigov/ui/form/Button/__stories__/Warning.tsx" />
 
 ### Disable buttons
 
 Disabled buttons have poor contrast and can confuse some users, so avoid them if possible.
 
-<Story packageName="@digigov/ui" component="form/Button" story="Disabled.tsx" />
+<code src="@digigov/ui/form/Button/__stories__/Disabled.tsx" />
 
 ### Grouping buttons
 
 Use a button group when two or more buttons are placed together.
 
-<Story
-  packageName="@digigov/ui"
-  component="form/Button"
-  story="GroupingButtons.tsx"
-/>
+<code src="@digigov/ui/form/Button/__stories__/GroupingButtons.tsx" />
 
 Any links within a button group will automatically align with the buttons.
 
-<Story
-  packageName="@digigov/ui"
-  component="form/Button"
-  story="GroupingButtonsAndLinks.tsx"
-/>
+<code src="@digigov/ui/form/Button/__stories__/GroupingButtonsAndLinks.tsx" />
 
 Write button text in sentence case, describing the action it performs. For
 example:
@@ -91,14 +75,12 @@ Align the primary action button to the left edge of your form.
 
 Use a default button for the main call to action on a page.
 
+<code src="@digigov/ui/form/Button/__stories__/Primary.tsx" />
+
 Avoid using multiple default buttons on a single page. Having more than on main
 call to action reduces their impact, and makes it harder for users to know what
 to do next.
 
-## API Docs
-
-Read more about [how to use the React types](/docs/api/Button).
-
 ## Accessibility
 
 You can read more about the accessibility patterns used in our Button
@@ -106,6 +88,9 @@ implementation in the ARIA Authoring Practices Guide (APG) at [button](https://w
 
 ## API
 
+Read more about [how to use the React types](/docs/api/Button).
+
 See below for a complete reference to all of the props  available to the components mentioned here.
 
 <ComponentProps componentName={["Button","ButtonLink","CallToAction","ButtonGroup"]} /> 
+

package/src/form/Button/index.test.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { test, expect } from '@playwright/experimental-ct-react';
-import TestVariant from '@digigov/ui/utils/TestVariant'
 import { Back } from '@digigov/ui/form/Button/__stories__/Back';
 import { ButtonLinkButton } from '@digigov/ui/form/Button/__stories__/ButtonLinkButton';
 import { CallToActionButton } from '@digigov/ui/form/Button/__stories__/CallToActionButton';
@@ -13,52 +12,54 @@ import { Secondary } from '@digigov/ui/form/Button/__stories__/Secondary';
 import { ThemeToggle } from '@digigov/ui/form/Button/__stories__/ThemeToggle';
 import { Warning } from '@digigov/ui/form/Button/__stories__/Warning';
 import { WithVariantLink } from '@digigov/ui/form/Button/__stories__/WithVariantLink';
+import TestVariant from '@digigov/ui/utils/TestVariant';
 
 test('renders the All Button variants', async ({ mount, page }) => {
   await mount(
-    
-  <div>
-    <TestVariant title="Back">
-      <Back />
-    </TestVariant>
-    <TestVariant title="ButtonLinkButton">
-      <ButtonLinkButton />
-    </TestVariant>
-    <TestVariant title="CallToActionButton">
-      <CallToActionButton />
-    </TestVariant>
-    <TestVariant title="Dense">
-      <Dense />
-    </TestVariant>
-    <TestVariant title="Disabled">
-      <Disabled />
-    </TestVariant>
-    <TestVariant title="GroupingButtons">
-      <GroupingButtons />
-    </TestVariant>
-    <TestVariant title="GroupingButtonsAndLinks">
-      <GroupingButtonsAndLinks />
-    </TestVariant>
-    <TestVariant title="Primary">
-      <Primary />
-    </TestVariant>
-    <TestVariant title="Secondary">
-      <Secondary />
-    </TestVariant>
-    <TestVariant title="ThemeToggle">
-      <ThemeToggle />
-    </TestVariant>
-    <TestVariant title="Warning">
-      <Warning />
-    </TestVariant>
-    <TestVariant title="WithVariantLink">
-      <WithVariantLink />
-    </TestVariant>
-  </div>
-  )
+    <div>
+      <TestVariant title="Back">
+        <Back />
+      </TestVariant>
+      <TestVariant title="ButtonLinkButton">
+        <ButtonLinkButton />
+      </TestVariant>
+      <TestVariant title="CallToActionButton">
+        <CallToActionButton />
+      </TestVariant>
+      <TestVariant title="Dense">
+        <Dense />
+      </TestVariant>
+      <TestVariant title="Disabled">
+        <Disabled />
+      </TestVariant>
+      <TestVariant title="GroupingButtons">
+        <GroupingButtons />
+      </TestVariant>
+      <TestVariant title="GroupingButtonsAndLinks">
+        <GroupingButtonsAndLinks />
+      </TestVariant>
+      <TestVariant title="Primary">
+        <Primary />
+      </TestVariant>
+      <TestVariant title="Secondary">
+        <Secondary />
+      </TestVariant>
+      <TestVariant title="ThemeToggle">
+        <ThemeToggle />
+      </TestVariant>
+      <TestVariant title="Warning">
+        <Warning />
+      </TestVariant>
+      <TestVariant title="WithVariantLink">
+        <WithVariantLink />
+      </TestVariant>
+    </div>
+  );
   await page.evaluate(() => document.fonts.ready);
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  

package/src/form/Button/interaction.test.tsx

@@ -7,69 +7,68 @@ import { Secondary } from '@digigov/ui/form/Button/__stories__/Secondary';
 import { ThemeToggle } from '@digigov/ui/form/Button/__stories__/ThemeToggle';
 import { Warning } from '@digigov/ui/form/Button/__stories__/Warning';
 
-test('renders the GroupingButtonsAndLinks Keyboard navigation', async ({ mount, page }) => {
-  await mount(
-    <GroupingButtonsAndLinks />
-  )
+test('renders the GroupingButtonsAndLinks Keyboard navigation', async ({
+  mount,
+  page,
+}) => {
+  await mount(<GroupingButtonsAndLinks />);
   await page.evaluate(() => document.fonts.ready);
- await page.keyboard.press("Tab");
- await page.keyboard.press("Tab");
+  await page.keyboard.press('Tab');
+  await page.keyboard.press('Tab');
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  
-
 
 test('renders the Primary Hover and click', async ({ mount, page }) => {
-  await mount(
-    <Primary />
-  )
+  await mount(<Primary />);
   await page.evaluate(() => document.fonts.ready);
- await page.locator("#root>button").hover();
- await page.locator("#root>button").click();
+  await page.locator('#root>button').hover();
+  await page.locator('#root>button').click();
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  
-
 
 test('renders the Secondary Hover and click', async ({ mount, page }) => {
-  await mount(
-    <Secondary />
-  )
+  await mount(<Secondary />);
   await page.evaluate(() => document.fonts.ready);
- await page.locator("#root>button").hover();
- await page.locator("#root>button").click();
+  await page.locator('#root>button').hover();
+  await page.locator('#root>button').click();
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  
-
 
 test('renders the ThemeToggle change theme', async ({ mount, page }) => {
-  await mount(
-    <ThemeToggle />
-  )
+  await mount(<ThemeToggle />);
   await page.evaluate(() => document.fonts.ready);
- await page.locator("#root>button").click();
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  await page.locator('#root>button').click();
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-  
-
 
 test('renders the Warning Hover and click', async ({ mount, page }) => {
-  await mount(
-    <Warning />
-  )
+  await mount(<Warning />);
   await page.evaluate(() => document.fonts.ready);
- await page.locator("#root>button").hover();
- await page.locator("#root>button").click();
+  await page.locator('#root>button').hover();
+  await page.locator('#root>button').click();
 
-  const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
+  const screenshot = await page.screenshot({
+    fullPage: true,
+    animations: 'disabled',
+  });
   expect(screenshot).toMatchSnapshot();
 });
-