resolve conflicts

src/__screenshot_tests__/navigation-bar-screenshot-test.tsx

@@ -3,16 +3,18 @@ import {openStoryPage, screen} from '../test-utils';
 const DEVICES = ['MOBILE_IOS', 'DESKTOP'] as const;
 
 test.each`
-    inverse  | isDarkMode
-    ${false} | ${false}
-    ${false} | ${true}
-    ${true}  | ${false}
-    ${true}  | ${true}
-`('MainNavigationBar desktop. inverse={$inverse} isDarkMode={$isDarkMode}', async ({inverse, isDarkMode}) => {
+    variant          | isDarkMode
+    ${'default'}     | ${false}
+    ${'default'}     | ${true}
+    ${'inverse'}     | ${false}
+    ${'inverse'}     | ${true}
+    ${'alternative'} | ${false}
+    ${'alternative'} | ${true}
+`('MainNavigationBar desktop. variant={$variant} isDarkMode={$isDarkMode}', async ({variant, isDarkMode}) => {
     const page = await openStoryPage({
         id: 'components-navigation-bars-mainnavigationbar--default',
         device: 'DESKTOP',
-        args: {inverse},
+        args: {variant},
         isDarkMode,
     });
 
@@ -22,16 +24,18 @@ test.each`
 });
 
 test.each`
-    inverse  | isDarkMode
-    ${false} | ${false}
-    ${false} | ${true}
-    ${true}  | ${false}
-    ${true}  | ${true}
-`('MainNavigationBar mobile. inverse={$inverse} isDarkMode={$isDarkMode}', async ({inverse, isDarkMode}) => {
+    variant          | isDarkMode
+    ${'default'}     | ${false}
+    ${'default'}     | ${true}
+    ${'inverse'}     | ${false}
+    ${'inverse'}     | ${true}
+    ${'alternative'} | ${false}
+    ${'alternative'} | ${true}
+`('MainNavigationBar mobile. variant={$variant} isDarkMode={$isDarkMode}', async ({variant, isDarkMode}) => {
     const page = await openStoryPage({
         id: 'components-navigation-bars-mainnavigationbar--default',
         device: 'MOBILE_IOS',
-        args: {inverse},
+        args: {variant},
         isDarkMode,
     });
 
@@ -70,22 +74,26 @@ test('MainNavigationBar large', async () => {
 });
 
 test.each`
-    inverse  | isDarkMode | device
-    ${false} | ${false}   | ${'DESKTOP'}
-    ${false} | ${true}    | ${'DESKTOP'}
-    ${true}  | ${false}   | ${'DESKTOP'}
-    ${true}  | ${true}    | ${'DESKTOP'}
-    ${false} | ${false}   | ${'MOBILE_IOS'}
-    ${false} | ${true}    | ${'MOBILE_IOS'}
-    ${true}  | ${false}   | ${'MOBILE_IOS'}
-    ${true}  | ${true}    | ${'MOBILE_IOS'}
+    variant          | isDarkMode | device
+    ${'default'}     | ${false}   | ${'DESKTOP'}
+    ${'default'}     | ${true}    | ${'DESKTOP'}
+    ${'inverse'}     | ${false}   | ${'DESKTOP'}
+    ${'inverse'}     | ${true}    | ${'DESKTOP'}
+    ${'alternative'} | ${false}   | ${'DESKTOP'}
+    ${'alternative'} | ${true}    | ${'DESKTOP'}
+    ${'default'}     | ${false}   | ${'MOBILE_IOS'}
+    ${'default'}     | ${true}    | ${'MOBILE_IOS'}
+    ${'inverse'}     | ${false}   | ${'MOBILE_IOS'}
+    ${'inverse'}     | ${true}    | ${'MOBILE_IOS'}
+    ${'alternative'} | ${false}   | ${'MOBILE_IOS'}
+    ${'alternative'} | ${true}    | ${'MOBILE_IOS'}
 `(
-    'NavigationBar. inverse={$inverse} isDarkMode={$isDarkMode} device={$device}',
-    async ({inverse, isDarkMode, device}) => {
+    'NavigationBar. variant={$variant} isDarkMode={$isDarkMode} device={$device}',
+    async ({variant, isDarkMode, device}) => {
         const page = await openStoryPage({
             id: 'components-navigation-bars-navigationbar--default',
             device,
-            args: {inverse},
+            args: {variant},
             isDarkMode,
         });
 
@@ -96,22 +104,26 @@ test.each`
 );
 
 test.each`
-    inverse  | isDarkMode | device
-    ${false} | ${false}   | ${'DESKTOP'}
-    ${false} | ${true}    | ${'DESKTOP'}
-    ${true}  | ${false}   | ${'DESKTOP'}
-    ${true}  | ${true}    | ${'DESKTOP'}
-    ${false} | ${false}   | ${'MOBILE_IOS'}
-    ${false} | ${true}    | ${'MOBILE_IOS'}
-    ${true}  | ${false}   | ${'MOBILE_IOS'}
-    ${true}  | ${true}    | ${'MOBILE_IOS'}
+    variant          | isDarkMode | device
+    ${'default'}     | ${false}   | ${'DESKTOP'}
+    ${'default'}     | ${true}    | ${'DESKTOP'}
+    ${'inverse'}     | ${false}   | ${'DESKTOP'}
+    ${'inverse'}     | ${true}    | ${'DESKTOP'}
+    ${'alternative'} | ${false}   | ${'DESKTOP'}
+    ${'alternative'} | ${true}    | ${'DESKTOP'}
+    ${'default'}     | ${false}   | ${'MOBILE_IOS'}
+    ${'default'}     | ${true}    | ${'MOBILE_IOS'}
+    ${'inverse'}     | ${false}   | ${'MOBILE_IOS'}
+    ${'inverse'}     | ${true}    | ${'MOBILE_IOS'}
+    ${'alternative'} | ${false}   | ${'MOBILE_IOS'}
+    ${'alternative'} | ${true}    | ${'MOBILE_IOS'}
 `(
-    'FunnelNavigationBar. inverse={$inverse} isDarkMode={$isDarkMode} device={$device}',
-    async ({inverse, isDarkMode, device}) => {
+    'FunnelNavigationBar. variant={$variant} isDarkMode={$isDarkMode} device={$device}',
+    async ({variant, isDarkMode, device}) => {
         const page = await openStoryPage({
             id: 'components-navigation-bars-funnelnavigationbar--default',
             device,
-            args: {inverse},
+            args: {variant},
             isDarkMode,
         });
 

src/__stories__/funnel-navigation-bar-story.tsx

@@ -10,6 +10,8 @@ import {
 } from '..';
 import {vars} from '../skins/skin-contract.css';
 
+import type {Variant} from '../theme-variant-context';
+
 export default {
     title: 'Components/Navigation bars/FunnelNavigationBar',
     component: FunnelNavigationBar,
@@ -18,14 +20,14 @@ export default {
     },
 };
 
-type Args = {inverse: boolean; border: boolean};
+type Args = {variant: Variant; border: boolean};
 
-export const Default: StoryComponent<Args> = ({inverse, border}) => {
+export const Default: StoryComponent<Args> = ({variant, border}) => {
     const {isDesktopOrBigger} = useScreenSize();
     return (
         <FunnelNavigationBar
             withBorder={border}
-            isInverse={inverse}
+            variant={variant}
             right={
                 <NavigationBarActionGroup>
                     <NavigationBarAction aria-label="need help?" href="/help">
@@ -49,6 +51,13 @@ export const Default: StoryComponent<Args> = ({inverse, border}) => {
 Default.storyName = 'FunnelNavigationBar';
 
 Default.args = {
-    inverse: false,
+    variant: 'default',
     border: true,
 };
+
+Default.argTypes = {
+    variant: {
+        options: ['default', 'inverse', 'alternative'],
+        control: {type: 'select'},
+    },
+};

src/__stories__/main-navigation-bar-story.tsx

@@ -11,6 +11,8 @@ import {
 } from '..';
 import avatarImg from './images/avatar.jpg';
 
+import type {Variant} from '../theme-variant-context';
+
 export default {
     title: 'Components/Navigation bars/MainNavigationBar',
     component: MainNavigationBar,
@@ -22,19 +24,19 @@ export default {
 const sectionTitles = ['Start', 'Account', 'Explore', 'Support'];
 
 type Args = {
-    inverse: boolean;
+    variant: Variant;
     border: boolean;
     burgerMenuExtra: boolean;
     large: boolean;
     sections: boolean;
 };
 
-export const Default: StoryComponent<Args> = ({inverse, border, burgerMenuExtra, large, sections}) => {
+export const Default: StoryComponent<Args> = ({variant, border, burgerMenuExtra, large, sections}) => {
     const [selectedIndex, setSelectedIndex] = React.useState(0);
     const {isDesktopOrBigger} = useScreenSize();
     return (
         <MainNavigationBar
-            isInverse={inverse}
+            variant={variant}
             large={large}
             withBorder={border}
             burgerMenuExtra={burgerMenuExtra ? <Placeholder /> : undefined}
@@ -64,9 +66,16 @@ export const Default: StoryComponent<Args> = ({inverse, border, burgerMenuExtra,
 Default.storyName = 'MainNavigationBar';
 
 Default.args = {
-    inverse: false,
+    variant: 'default',
     border: true,
     burgerMenuExtra: false,
     large: false,
     sections: true,
 };
+
+Default.argTypes = {
+    variant: {
+        options: ['default', 'inverse', 'alternative'],
+        control: {type: 'select'},
+    },
+};

src/__stories__/navigation-bar-story.tsx

@@ -7,6 +7,8 @@ import {
     IconSearchRegular,
 } from '..';
 
+import type {Variant} from '../theme-variant-context';
+
 export default {
     title: 'Components/Navigation bars/NavigationBar',
     component: NavigationBar,
@@ -15,14 +17,14 @@ export default {
     },
 };
 
-type Args = {isInverse: boolean; border: boolean};
+type Args = {variant: Variant; border: boolean};
 
-export const Default: StoryComponent<Args> = ({isInverse, border}) => {
+export const Default: StoryComponent<Args> = ({variant, border}) => {
     const {isDesktopOrBigger} = useScreenSize();
     return (
         <NavigationBar
             withBorder={border}
-            isInverse={isInverse}
+            variant={variant}
             onBack={() => {}}
             title="Settings"
             right={
@@ -40,6 +42,13 @@ export const Default: StoryComponent<Args> = ({isInverse, border}) => {
 Default.storyName = 'NavigationBar';
 
 Default.args = {
-    isInverse: false,
+    variant: 'default',
     border: true,
 };
+
+Default.argTypes = {
+    variant: {
+        options: ['default', 'inverse', 'alternative'],
+        control: {type: 'select'},
+    },
+};