@workday/canvas-kit-labs-react 6.0.0-beta.0-next.16 → 6.0.3

package/header/lib/parts/DubLogoTitle.tsx

@@ -1,16 +1,16 @@
 import * as React from 'react';
 import styled from '@emotion/styled';
 import {colors, space} from '@workday/canvas-kit-react/tokens';
-import {HeaderHeight, HeaderTheme} from '../shared/types';
+import {DeprecatedHeaderHeight, DeprecatedHeaderTheme} from '../shared/types';
 import chroma from 'chroma-js';
 import {dubLogoWhite, dubLogoBlue} from '@workday/canvas-kit-react/common';
 
 export type DubTitleProps = {
   /**
    * The theme of the DubLogoTitle. Accepts `White`, `Blue`, or `Transparent`.
-   * @default HeaderTheme.White
+   * @default DeprecatedHeaderTheme.White
    */
-  themeColor?: HeaderTheme;
+  themeColor?: DeprecatedHeaderTheme;
   /**
    * The text of the DubLogoTitle. Not used if `brand` is provided.
    */
@@ -29,7 +29,7 @@ const Lockup = styled('div')<DubTitleProps>(
   {
     display: 'flex',
     alignItems: 'center',
-    height: HeaderHeight.Small,
+    height: DeprecatedHeaderHeight.Small,
     paddingLeft: space.m,
   },
   ({bgColor}) => ({
@@ -47,9 +47,10 @@ const Title = styled('h3')<DubTitleProps>(
     whiteSpace: 'nowrap',
   },
   ({themeColor}) => ({
-    color: themeColor === HeaderTheme.White ? colors.blueberry500 : colors.frenchVanilla100,
+    color:
+      themeColor === DeprecatedHeaderTheme.White ? colors.blueberry500 : colors.frenchVanilla100,
     borderLeft: `1px solid ${
-      themeColor === HeaderTheme.White
+      themeColor === DeprecatedHeaderTheme.White
         ? colors.soap400
         : chroma(colors.frenchVanilla100)
             .alpha(0.3)
@@ -62,16 +63,32 @@ const DubLogo = styled('div')<DubTitleProps>({
   lineHeight: 0,
 });
 
-export class DubLogoTitle extends React.Component<DubTitleProps> {
+/**
+ * ### Deprecated Dub Logo Title
+ *
+ * As of Canvas Kit v6, this component is being soft-deprecated.
+ * It will be hard-deprecated (completely removed) in v7. Please see the
+ * [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
+ * for more information.
+ */
+export class DeprecatedDubLogoTitle extends React.Component<DubTitleProps> {
+  componentDidMount() {
+    console.warn(
+      `DubLogoTitle is being deprecated and will be removed in Canvas Kit V7.\n
+      For more information, please see the V6 migration guide:\n
+      https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page
+      `
+    );
+  }
   render() {
-    const {themeColor = HeaderTheme.White, title} = this.props;
+    const {themeColor = DeprecatedHeaderTheme.White, title} = this.props;
     return (
       <LockupContainer>
         <Lockup {...this.props}>
           <DubLogo
             {...this.props}
             dangerouslySetInnerHTML={{
-              __html: themeColor === HeaderTheme.White ? dubLogoBlue : dubLogoWhite,
+              __html: themeColor === DeprecatedHeaderTheme.White ? dubLogoBlue : dubLogoWhite,
             }}
           />
           {title && <Title {...this.props}>{title}</Title>}

package/header/lib/parts/WorkdayLogoTitle.tsx

@@ -1,6 +1,10 @@
 import * as React from 'react';
 import styled from '@emotion/styled';
-import {HeaderHeight, HeaderTheme, HeaderVariant} from '../shared/types';
+import {
+  DeprecatedHeaderHeight,
+  DeprecatedHeaderTheme,
+  DeprecatedHeaderVariant,
+} from '../shared/types';
 import {miniWdayLogoBlue, wdayLogoWhite, wdayLogoBlue} from '@workday/canvas-kit-react/common';
 import {colors, space} from '@workday/canvas-kit-react/tokens';
 import chroma from 'chroma-js';
@@ -8,9 +12,9 @@ import chroma from 'chroma-js';
 export type WorkdayLogoTitleProps = {
   /**
    * The theme of the WorkdayLogoTitle. Accepts `White`, `Blue`, or `Transparent`.
-   * @default HeaderTheme.White
+   * @default DeprecatedHeaderTheme.White
    */
-  themeColor?: HeaderTheme;
+  themeColor?: DeprecatedHeaderTheme;
   /**
    * The text of the WorkdayLogoTitle. Not used if `brand` is provided.
    * @default ''
@@ -19,7 +23,7 @@ export type WorkdayLogoTitleProps = {
   /**
    * The variant of the WorkdayLogoTitle.
    */
-  variant?: HeaderVariant;
+  variant?: DeprecatedHeaderVariant;
 };
 
 const LockupContainer = styled('div')({
@@ -33,7 +37,10 @@ const Lockup = styled('div')<WorkdayLogoTitleProps>(
     justifyContent: 'center',
   },
   ({variant}) => ({
-    height: variant === HeaderVariant.Global ? HeaderHeight.Small : HeaderHeight.Large,
+    height:
+      variant === DeprecatedHeaderVariant.Global
+        ? DeprecatedHeaderHeight.Small
+        : DeprecatedHeaderHeight.Large,
   })
 );
 
@@ -49,9 +56,10 @@ const Title = styled('h3')<WorkdayLogoTitleProps>(
     display: 'initial',
   },
   ({themeColor}) => ({
-    color: themeColor === HeaderTheme.White ? colors.blueberry500 : colors.frenchVanilla100,
+    color:
+      themeColor === DeprecatedHeaderTheme.White ? colors.blueberry500 : colors.frenchVanilla100,
     borderLeft: `1px solid ${
-      themeColor === HeaderTheme.White
+      themeColor === DeprecatedHeaderTheme.White
         ? colors.soap400
         : chroma(colors.soap400)
             .alpha(0.4)
@@ -65,9 +73,30 @@ const WorkdayLogo = styled('span')<WorkdayLogoTitleProps>({
   lineHeight: 0,
 });
 
-export class WorkdayLogoTitle extends React.Component<WorkdayLogoTitleProps> {
+/**
+ * ### Deprecated Workday Logo Title
+ *
+ * As of Canvas Kit v6, this component is being soft-deprecated.
+ * It will be hard-deprecated (completely removed) in v7. Please see the
+ * [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
+ * for more information.
+ */
+export class DeprecatedWorkdayLogoTitle extends React.Component<WorkdayLogoTitleProps> {
+  componentDidMount() {
+    console.warn(
+      `WorkdayLogoTitle is being deprecated and will be removed in Canvas Kit V7.\n
+      For more information, please see the V6 migration guide:\n
+      https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page
+      `
+    );
+  }
   public render() {
-    const {themeColor = HeaderTheme.White, title = '', variant, ...elemProps} = this.props;
+    const {
+      themeColor = DeprecatedHeaderTheme.White,
+      title = '',
+      variant,
+      ...elemProps
+    } = this.props;
 
     return (
       <LockupContainer>
@@ -76,8 +105,8 @@ export class WorkdayLogoTitle extends React.Component<WorkdayLogoTitleProps> {
             {...this.props}
             dangerouslySetInnerHTML={{
               __html:
-                themeColor === HeaderTheme.White
-                  ? variant === HeaderVariant.Global
+                themeColor === DeprecatedHeaderTheme.White
+                  ? variant === DeprecatedHeaderVariant.Global
                     ? miniWdayLogoBlue
                     : wdayLogoBlue
                   : wdayLogoWhite,

package/header/lib/parts/index.ts

@@ -1,3 +1,2 @@
-export {DubLogoTitle} from './DubLogoTitle';
-export {SearchBar, SearchBarProps} from './SearchBar';
-export {WorkdayLogoTitle} from './WorkdayLogoTitle';
+export {DeprecatedDubLogoTitle} from './DubLogoTitle';
+export {DeprecatedWorkdayLogoTitle} from './WorkdayLogoTitle';

package/header/lib/shared/themes.tsx

@@ -1,4 +1,3 @@
-import {focusRing} from '@workday/canvas-kit-react/common';
 import {
   colors,
   gradients,
@@ -7,9 +6,17 @@ import {
   CSSProperties,
 } from '@workday/canvas-kit-react/tokens';
 import chroma from 'chroma-js';
-import {HeaderTheme, SearchTheme} from './types';
+import {DeprecatedHeaderTheme} from './types';
 
-export interface ThemeAttributes {
+/**
+ * ### Deprecated Header Theme Attributes Interface
+ *
+ * As of Canvas Kit v6, this type interface is being soft-deprecated along with the rest of the labs/header package.
+ * It will be hard-deprecated (completely removed) in v7. Please see the
+ * [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
+ * for more information.
+ */
+export interface DeprecatedHeaderThemeAttributes {
   color: string;
   background: string;
   depth: CSSProperties;
@@ -23,12 +30,28 @@ export interface ThemeAttributes {
   chipColor: string;
 }
 
-export interface Themes {
-  [key: string]: ThemeAttributes;
+/**
+ * ### Deprecated Header Themes Interface
+ *
+ * As of Canvas Kit v6, this type interface is being soft-deprecated along with the rest of the labs/header package.
+ * It will be hard-deprecated (completely removed) in v7. Please see the
+ * [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
+ * for more information.
+ */
+export interface DeprecatedHeaderThemes {
+  [key: string]: DeprecatedHeaderThemeAttributes;
 }
 
-export const themes: Themes = {
-  [HeaderTheme.White]: {
+/**
+ * ### Deprecated Header Themes
+ *
+ * As of Canvas Kit v6, this theme object is being soft-deprecated along with the rest of the labs/header package.
+ * It will be hard-deprecated (completely removed) in v7. Please see the
+ * [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
+ * for more information.
+ */
+export const deprecatedHeaderThemes: DeprecatedHeaderThemes = {
+  [DeprecatedHeaderTheme.White]: {
     color: colors.blackPepper400,
     background: colors.frenchVanilla100,
     depth: depth['1'],
@@ -41,7 +64,7 @@ export const themes: Themes = {
     currentLinkColor: colors.blueberry500,
     chipColor: colors.blueberry400,
   },
-  [HeaderTheme.Blue]: {
+  [DeprecatedHeaderTheme.Blue]: {
     color: colors.frenchVanilla100,
     background: gradients.blueberry,
     depth: depth['3'],
@@ -56,7 +79,7 @@ export const themes: Themes = {
     currentLinkColor: colors.frenchVanilla100,
     chipColor: colors.frenchVanilla100,
   },
-  [HeaderTheme.Transparent]: {
+  [DeprecatedHeaderTheme.Transparent]: {
     color: colors.frenchVanilla100,
     background: 'transparent',
     depth: {boxShadow: 'none'},
@@ -72,50 +95,3 @@ export const themes: Themes = {
     chipColor: colors.frenchVanilla100,
   },
 };
-
-export interface SearchThemeAttributes {
-  background?: string;
-  backgroundFocus?: string;
-  backgroundHover?: string;
-  color?: string;
-  colorFocus?: string;
-  placeholderColor?: string;
-  placeholderColorFocus?: string;
-  boxShadow?: string | string[];
-  boxShadowFocus?: string | string[];
-}
-
-export interface SearchThemes {
-  [key: string]: SearchThemeAttributes;
-}
-
-export const searchThemes: SearchThemes = {
-  [SearchTheme.Transparent]: {
-    background: 'rgba(0, 0, 0, 0)',
-    backgroundFocus: 'rgba(0, 0, 0, 0)',
-    color: colors.blackPepper300,
-    colorFocus: colors.blackPepper300,
-    placeholderColor: colors.licorice300,
-    placeholderColorFocus: colors.licorice300,
-    boxShadow: 'none',
-    boxShadowFocus: 'none',
-  },
-  [SearchTheme.Light]: {
-    background: colors.soap200,
-    backgroundFocus: colors.soap200,
-    backgroundHover: colors.soap300,
-    color: colors.blackPepper300,
-    placeholderColor: colors.licorice300,
-    boxShadow: 'none',
-    boxShadowFocus: focusRing().boxShadow,
-  },
-  [SearchTheme.Dark]: {
-    background: 'rgba(0, 0, 0, 0.2)',
-    backgroundFocus: colors.frenchVanilla100,
-    color: colors.frenchVanilla100,
-    colorFocus: colors.blackPepper300,
-    placeholderColor: colors.frenchVanilla100,
-    placeholderColorFocus: colors.licorice300,
-    boxShadow: 'none',
-  },
-};

package/header/lib/shared/types.tsx

@@ -1,22 +1,16 @@
-export enum HeaderTheme {
+export enum DeprecatedHeaderTheme {
   White,
   Blue,
   Transparent,
 }
 
-export enum HeaderVariant {
+export enum DeprecatedHeaderVariant {
   Dub,
   Full,
   Global,
 }
 
-export enum HeaderHeight {
+export enum DeprecatedHeaderHeight {
   Small = '64px',
   Large = '80px',
 }
-
-export enum SearchTheme {
-  Light,
-  Dark,
-  Transparent,
-}

package/index.ts

@@ -3,3 +3,5 @@ export * from './common';
 export * from './drawer';
 export * from './header';
 export * from './layout';
+export * from './text-input';
+export * from './search-form';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-labs-react",
-  "version": "6.0.0-beta.0-next.16+2c70e470",
+  "version": "6.0.3",
   "description": "Canvas Kit Labs is an incubator for new and experimental components. Since we have a rather rigorous process for getting components in at a production level, it can be valuable to make them available earlier while we continuously iterate on the API/functionality. The Labs modules allow us to do that as needed.",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -55,8 +55,8 @@
     "@emotion/is-prop-valid": "^0.8.2",
     "@emotion/styled": "^10.0.27",
     "@types/uuid": "^3.4.4",
-    "@workday/canvas-kit-preview-react": "^6.0.0-beta.0-next.16+2c70e470",
-    "@workday/canvas-kit-react": "^6.0.0-beta.0-next.16+2c70e470",
+    "@workday/canvas-kit-preview-react": "^6.0.3",
+    "@workday/canvas-kit-react": "^6.0.3",
     "@workday/canvas-system-icons-web": "1.0.41",
     "chroma-js": "^2.1.0",
     "csstype": "^2.6.17",
@@ -65,7 +65,9 @@
     "uuid": "^3.3.3"
   },
   "devDependencies": {
-    "@types/lodash.flatten": "^4.4.6"
+    "@types/lodash.flatten": "^4.4.6",
+    "formik": "^2.2.9",
+    "yup": "^0.31.1"
   },
-  "gitHead": "2c70e470ff0afecfdd18ea96837ab7f19f812128"
+  "gitHead": "735c60ddf52268f643c72ceb915e896906f74bcc"
 }

package/search-form/LICENSE

@@ -0,0 +1,52 @@
+Apache License, Version 2.0 Apache License Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License.
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+You must give any other recipients of the Work or Derivative Works a copy of this License; and You must cause any modified files to carry prominent notices stating that You changed the files; and You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions.
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks.
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability.
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+©2020. Workday, Inc. All rights reserved. Workday and the Workday logo are registered trademarks of Workday, Inc. All other brand and product names are trademarks or registered trademarks of their respective holders.
+
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

package/search-form/README.md

@@ -0,0 +1,6 @@
+# Canvas Kit React Search Form
+
+A search form that contains a combobox for rendering search results
+
+For more detailed information on this component, please refer to the
+[storybook documentation](https://workday.github.io/canvas-kit/?path=/docs/labs-search-form)

package/search-form/index.ts

@@ -0,0 +1,2 @@
+export * from './lib/SearchForm';
+export * from './lib/themes';

package/{header/lib/parts/SearchBar.tsx → search-form/lib/SearchForm.tsx}

@@ -8,27 +8,26 @@ import {FormField, FormFieldLabelPosition} from '@workday/canvas-kit-react/form-
 import {Combobox} from '@workday/canvas-kit-labs-react/combobox';
 import {TextInput} from '@workday/canvas-kit-react/text-input';
 import {MenuItemProps} from '@workday/canvas-kit-preview-react/menu';
-import {SearchThemeAttributes, searchThemes} from '../shared/themes';
-import {SearchTheme} from '../shared/types';
+import {SearchThemeAttributes, searchThemes, SearchTheme} from './themes';
 import chroma from 'chroma-js';
 import uuid from 'uuid/v4';
 
-export interface SearchBarProps extends GrowthBehavior, React.FormHTMLAttributes<HTMLFormElement> {
+export interface SearchFormProps extends GrowthBehavior, React.FormHTMLAttributes<HTMLFormElement> {
   /**
-   * The function called when the SearchBar form is submitted. The current input value is passed to the callback function.
+   * The function called when the SearchForm form is submitted. The current input value is passed to the callback function.
    */
   onSubmit: React.FormEventHandler<HTMLFormElement>;
   /**
-   * If true, collapse the SearchBar text input into a toggle icon. Useful for responsive layouts.
+   * If true, collapse the SearchForm text input into a toggle icon. Useful for responsive layouts.
    * @default false
    */
   isCollapsed?: boolean;
   /**
-   * The function called when the SearchBar text input changes.
+   * The function called when the SearchForm text input changes.
    */
   onInputChange?: React.ChangeEventHandler<HTMLInputElement>;
   /**
-   * The autocomplete items of the SearchBar. This array of menu items is shown under the search bar.
+   * The autocomplete items of the SearchForm. This array of menu items is shown under the search bar.
    */
   autocompleteItems?: React.ReactElement<MenuItemProps>[];
   /**
@@ -36,57 +35,57 @@ export interface SearchBarProps extends GrowthBehavior, React.FormHTMLAttributes
    */
   searchTheme?: SearchTheme | SearchThemeAttributes;
   /**
-   * The placeholder text of the SearchBar text input.
+   * The placeholder text of the SearchForm text input.
    * @default Search
    */
   placeholder?: string;
   /**
-   * The initial value of the SearchBar text input.
+   * The initial value of the SearchForm text input.
    */
   initialValue?: string;
   /**
-   * If true, right-align the SearchBar. If false, the text input should grow to left-align the SearchBar.
+   * If true, right-align the SearchForm. If false, the text input should grow to left-align the SearchForm.
    * @default false
    */
   rightAlign?: boolean;
   /**
-   * The screenreader label text for the SearchBar text input.
+   * The screenreader label text for the SearchForm text input.
    * @default Search
    */
   inputLabel?: string;
   /**
-   * The screenreader label text for the SearchBar submit button.
+   * The screenreader label text for the SearchForm submit button.
    * @default Search
    */
   submitAriaLabel?: string;
   /**
-   * The screenreader label text for the SearchBar clear button.
+   * The screenreader label text for the SearchForm clear button.
    * @default Reset Search Form
    */
   clearButtonAriaLabel?: string;
   /**
-   * The screenreader label text for the button to open the collapsed SearchBar.
+   * The screenreader label text for the button to open the collapsed SearchForm.
    * @default Open Search
    */
   openButtonAriaLabel?: string;
   /**
-   * The screenreader label text for the button to close the open SearchBar.
+   * The screenreader label text for the button to close the open SearchForm.
    * @default Cancel
    */
   closeButtonAriaLabel?: string;
   /**
-   * If true, render the SearchBar with a button to clear the text input.
+   * If true, render the SearchForm with a button to clear the text input.
    * @default true
    */
   showClearButton?: boolean;
   /**
-   * Height of the Search Bar in pixels
-   * @default: 40
+   * Height of the Search Form in pixels
+   * @default 40
    */
   height?: number;
 }
 
-export interface SearchBarState {
+export interface SearchFormState {
   showForm: boolean;
   searchQuery: string;
   isFocused: boolean;
@@ -110,8 +109,8 @@ const formCollapsedBackground = colors.frenchVanilla100;
 const maxWidth = 480;
 const minWidth = 120;
 
-const SearchForm = styled('form')<
-  Pick<SearchBarProps, 'isCollapsed' | 'rightAlign' | 'grow'> & Pick<SearchBarState, 'showForm'>
+const StyledSearchForm = styled('form')<
+  Pick<SearchFormProps, 'isCollapsed' | 'rightAlign' | 'grow'> & Pick<SearchFormState, 'showForm'>
 >(
   {
     position: 'relative',
@@ -148,7 +147,7 @@ const SearchForm = styled('form')<
   }
 );
 
-const SearchContainer = styled('div')<Pick<SearchBarProps, 'height'>>(
+const SearchContainer = styled('div')<Pick<SearchFormProps, 'height'>>(
   {
     position: `relative`,
     display: 'flex',
@@ -166,7 +165,7 @@ const SearchCombobox = styled(Combobox)({
   width: `100%`,
 });
 
-const SearchIcon = styled(IconButton)<Pick<SearchBarProps, 'isCollapsed'> & {isHidden: boolean}>(
+const SearchIcon = styled(IconButton)<Pick<SearchFormProps, 'isCollapsed'> & {isHidden: boolean}>(
   ({isCollapsed, isHidden}) => {
     const collapsedSize = 40;
     const size = 32;
@@ -199,7 +198,7 @@ const SearchIcon = styled(IconButton)<Pick<SearchBarProps, 'isCollapsed'> & {isH
 );
 
 const CloseButton = styled(IconButton)<
-  Pick<SearchBarProps, 'isCollapsed'> & Pick<SearchBarState, 'showForm'>
+  Pick<SearchFormProps, 'isCollapsed'> & Pick<SearchFormState, 'showForm'>
 >(({isCollapsed, showForm}) => {
   const collapseStyles: CSSObject =
     isCollapsed && showForm
@@ -222,7 +221,7 @@ const CloseButton = styled(IconButton)<
 });
 
 const SearchField = styled(FormField)<
-  Pick<SearchBarProps, 'isCollapsed' | 'grow' | 'height'> & Pick<SearchBarState, 'showForm'>
+  Pick<SearchFormProps, 'isCollapsed' | 'grow' | 'height'> & Pick<SearchFormState, 'showForm'>
 >(({isCollapsed, showForm, grow, height}) => {
   return {
     display: (isCollapsed && showForm) || !isCollapsed ? 'inline-block' : 'none',
@@ -237,7 +236,7 @@ const SearchField = styled(FormField)<
 });
 
 const SearchInput = styled(TextInput)<
-  Pick<SearchBarProps, 'isCollapsed' | 'grow' | 'height'> & {
+  Pick<SearchFormProps, 'isCollapsed' | 'grow' | 'height'> & {
     inputColors: ReturnType<typeof getInputColors>;
   }
 >(({isCollapsed, inputColors, grow, height}) => {
@@ -289,14 +288,14 @@ const SearchInput = styled(TextInput)<
   };
 });
 
-export class SearchBar extends React.Component<SearchBarProps, SearchBarState> {
+export class SearchForm extends React.Component<SearchFormProps, SearchFormState> {
   static Theme = SearchTheme;
 
   private inputRef = React.createRef<HTMLInputElement>();
   private openRef = React.createRef<HTMLButtonElement>();
   private labelId = uuid();
 
-  state: Readonly<SearchBarState> = {
+  state: Readonly<SearchFormState> = {
     showForm: false,
     searchQuery: '',
     isFocused: false,
@@ -352,7 +351,7 @@ export class SearchBar extends React.Component<SearchBarProps, SearchBarState> {
     }
   };
 
-  componentDidUpdate(prevProps: SearchBarProps, prevState: SearchBarState) {
+  componentDidUpdate(prevProps: SearchFormProps, prevState: SearchFormState) {
     const showFormToggled = this.state.showForm !== prevState.showForm;
     if (showFormToggled) {
       if (this.state.showForm) {
@@ -413,7 +412,7 @@ export class SearchBar extends React.Component<SearchBarProps, SearchBarState> {
     } = this.props;
 
     return (
-      <SearchForm
+      <StyledSearchForm
         role="search"
         action="."
         rightAlign={rightAlign}
@@ -486,7 +485,7 @@ export class SearchBar extends React.Component<SearchBarProps, SearchBarState> {
             type="button"
           />
         </SearchContainer>
-      </SearchForm>
+      </StyledSearchForm>
     );
   }
 }