feat(Modal): remove deprecated trigger_ props

dnbexperience · Jan 13, 2023 · 389bb3a · 389bb3a
1 parent 931de5f
commit 389bb3a
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 279 deletions.
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/components/modal/Examples.js b/packages/dnb-design-system-portal/src/docs/uilib/components/modal/Examples.js
@@ -70,7 +70,7 @@ export const ModalExampleCloseByHandler = () => (
       /* jsx */ `
 <Modal
   title="Auto close"
-  trigger_text="Click me"
+  triggerAttributes={{ text: "Click me" }}
   align_content="center"
   max_width="40rem"
   close_modal={close => {

diff --git a/packages/dnb-design-system-portal/src/docs/uilib/components/modal/visual-tests/Examples.js b/packages/dnb-design-system-portal/src/docs/uilib/components/modal/visual-tests/Examples.js
@@ -12,7 +12,7 @@ export const ModalExampleDrawerHeader = () => (
       /* jsx */ `
 <Modal
   mode="drawer"
-  trigger_text="Open Drawer"
+  triggerAttributes={{ text: "Open Drawer" }}
 >
   <Modal.Bar>
     <Breadcrumb />
@@ -94,7 +94,7 @@ export const ModalExampleDrawerBasic = () => (
 <Modal
   mode="drawer"
   title="Drawer Title"
-  trigger_text="Open Drawer"
+  triggerAttributes={{ text: "Open Drawer" }}
 >
   <Modal.Content>
     <P top>This is a left aligned Drawer content.</P>
@@ -111,7 +111,7 @@ export const DrawerWithoutSpacing = () => (
 <Modal
   mode="drawer"
   title="Drawer without spacing"
-  trigger_text="Open Drawer with no spacing"
+  triggerAttributes={{ text: "Open Drawer with no spacing" }}
   spacing={false}
 >
   <Modal.Content>
@@ -164,9 +164,7 @@ export const ModalExampleFullscreen = () => (
 <Modal
   title={<span className="dnb-sr-only">"Hidden" Modal title</span>}
   fullscreen="true"
-  trigger_variant="tertiary"
-  trigger_text="Click me"
-  trigger_icon="bell"
+  triggerAttributes={{ text: "Click me", icon: "bell", variant: "tertiary" }}
   modal_content="This is the modal text. Triggered by a tertiary button."
 />
 	`

diff --git a/.../dnb-design-system-portal/src/docs/uilib/components/progress-indicator/demos.md b/.../dnb-design-system-portal/src/docs/uilib/components/progress-indicator/demos.md
@@ -151,7 +151,7 @@ render(<ChangeValue />)
   fullscreen={false}
   align_content="centered"
   hide_close_button
-  trigger_text="Show"
+  triggerAttributes={{ text: "Show" }}
   prevent_close={false}
 >
   <ProgressIndicator
@@ -310,7 +310,7 @@ render(<ChangeValue />)
   fullscreen={false}
   align_content="centered"
   hide_close_button
-  trigger_text="Show"
+  triggerAttributes={{ text: "Show" }}
   prevent_close={false}
 >
   <ProgressIndicator

diff --git a/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.js b/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.js
@@ -249,9 +249,11 @@ export default class SidebarLayout extends React.PureComponent {
                 <MediaQuery when={{ min: 0, max: 'medium' }}>
                   <Space left="large" top="large">
                     <PortalToolsMenu
-                      trigger_text="Portal Tools"
-                      trigger_icon="chevron_right"
-                      trigger_icon_position="right"
+                      triggerAttributes={{
+                        text: 'Portal Tools',
+                        icon: 'chevron_right',
+                        icon_position: 'right',
+                      }}
                       tooltipPosition="bottom"
                     />
                   </Space>

diff --git a/packages/dnb-eufemia/src/components/dialog/__tests__/__snapshots__/Dialog.test.tsx.snap b/packages/dnb-eufemia/src/components/dialog/__tests__/__snapshots__/Dialog.test.tsx.snap
@@ -65,15 +65,6 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
     title="dialog_title"
     trigger={null}
     trigger_attributes={null}
-    trigger_class={null}
-    trigger_disabled={null}
-    trigger_hidden={false}
-    trigger_icon={null}
-    trigger_icon_position="left"
-    trigger_size={null}
-    trigger_text={null}
-    trigger_title={null}
-    trigger_variant="secondary"
   >
     <Modal
       align_content="left"
@@ -118,23 +109,9 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
       title="dialog_title"
       trigger={null}
       trigger_attributes={null}
-      trigger_class={null}
-      trigger_disabled={null}
-      trigger_hidden={false}
-      trigger_icon={null}
-      trigger_icon_position="left"
-      trigger_size={null}
-      trigger_text={null}
-      trigger_title={null}
-      trigger_variant="secondary"
     >
       <HelpButtonInstance
-        class={null}
         className="dnb-modal__trigger"
-        disabled={false}
-        hidden={false}
-        icon={null}
-        icon_position="left"
         id="dialog_id"
         innerRef={
           {
@@ -178,10 +155,7 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
           }
         }
         onClick={[Function]}
-        size={null}
-        text={null}
         title="dialog_title"
-        variant="secondary"
       >
         <Button
           aria-label="dialog_title"
@@ -192,10 +166,9 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
           custom_content={null}
           custom_element={null}
           custom_method={null}
-          disabled={false}
+          disabled={null}
           element={null}
           global_status_id={null}
-          hidden={false}
           href={null}
           icon="question"
           icon_position="left"
@@ -266,7 +239,6 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
             aria-roledescription="Hjelp-knapp"
             className="dnb-button dnb-button--secondary dnb-help-button dnb-modal__trigger dnb-button--icon-position-left dnb-button--has-icon dnb-button--size-medium"
             disabled={false}
-            hidden={false}
             id="dialog_id"
             onClick={[Function]}
             type="button"
@@ -281,10 +253,9 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
               custom_content={null}
               custom_element={null}
               custom_method={null}
-              disabled={false}
+              disabled={null}
               element={null}
               global_status_id={null}
-              hidden={false}
               href={null}
               icon="question"
               icon_position="left"

diff --git a/packages/dnb-eufemia/src/components/drawer/__tests__/__snapshots__/Drawer.test.tsx.snap b/packages/dnb-eufemia/src/components/drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
@@ -64,15 +64,6 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
     title="drawer_title"
     trigger={null}
     trigger_attributes={null}
-    trigger_class={null}
-    trigger_disabled={null}
-    trigger_hidden={false}
-    trigger_icon={null}
-    trigger_icon_position="left"
-    trigger_size={null}
-    trigger_text={null}
-    trigger_title={null}
-    trigger_variant="secondary"
   >
     <Modal
       align_content="left"
@@ -116,23 +107,9 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
       title="drawer_title"
       trigger={null}
       trigger_attributes={null}
-      trigger_class={null}
-      trigger_disabled={null}
-      trigger_hidden={false}
-      trigger_icon={null}
-      trigger_icon_position="left"
-      trigger_size={null}
-      trigger_text={null}
-      trigger_title={null}
-      trigger_variant="secondary"
     >
       <HelpButtonInstance
-        class={null}
         className="dnb-modal__trigger"
-        disabled={false}
-        hidden={false}
-        icon={null}
-        icon_position="left"
         id="drawer_id"
         innerRef={
           {
@@ -176,10 +153,7 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
           }
         }
         onClick={[Function]}
-        size={null}
-        text={null}
         title="drawer_title"
-        variant="secondary"
       >
         <Button
           aria-label="drawer_title"
@@ -190,10 +164,9 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
           custom_content={null}
           custom_element={null}
           custom_method={null}
-          disabled={false}
+          disabled={null}
           element={null}
           global_status_id={null}
-          hidden={false}
           href={null}
           icon="question"
           icon_position="left"
@@ -264,7 +237,6 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
             aria-roledescription="Hjelp-knapp"
             className="dnb-button dnb-button--secondary dnb-help-button dnb-modal__trigger dnb-button--icon-position-left dnb-button--has-icon dnb-button--size-medium"
             disabled={false}
-            hidden={false}
             id="drawer_id"
             onClick={[Function]}
             type="button"
@@ -279,10 +251,9 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
               custom_content={null}
               custom_element={null}
               custom_method={null}
-              disabled={false}
+              disabled={null}
               element={null}
               global_status_id={null}
-              hidden={false}
               href={null}
               icon="question"
               icon_position="left"

diff --git a/packages/dnb-eufemia/src/components/global-status/stories/GlobalStatus.stories.js b/packages/dnb-eufemia/src/components/global-status/stories/GlobalStatus.stories.js
@@ -218,7 +218,7 @@ const InputWithError = () => {
 
 const ModalExample = () => (
   <Modal
-    trigger_text="Open Modal"
+    trigger_attributes={{ text: 'Open Modal' }}
     title="Modal Title"
     // width="80vw"
     on_open={() => {

diff --git a/packages/dnb-eufemia/src/components/modal/Modal.tsx b/packages/dnb-eufemia/src/components/modal/Modal.tsx
@@ -120,18 +120,8 @@ class Modal extends React.PureComponent<
     open_modal: null,
     close_modal: null,
 
-    // All "trigger_" are deprecated
     trigger: null,
     trigger_attributes: null,
-    trigger_hidden: false,
-    trigger_disabled: null,
-    trigger_variant: 'secondary',
-    trigger_text: null,
-    trigger_title: null,
-    trigger_size: null,
-    trigger_icon: null,
-    trigger_icon_position: 'left',
-    trigger_class: null,
 
     overlay_class: null,
     content_class: null,
@@ -429,18 +419,8 @@ class Modal extends React.PureComponent<
       open_delay, // eslint-disable-line
 
       omit_trigger_button = false,
-      // All "trigger_" are deprecated
       trigger = null,
       trigger_attributes = null,
-      trigger_hidden = 'false',
-      trigger_disabled = null,
-      trigger_variant = 'secondary',
-      trigger_text = null,
-      trigger_title = null,
-      trigger_size = null,
-      trigger_icon,
-      trigger_icon_position = 'left',
-      trigger_class = null,
 
       ...rest
     } = props
@@ -453,18 +433,10 @@ class Modal extends React.PureComponent<
     )
 
     const render = (suffixProps) => {
-      const triggerAttributes = {
-        hidden: isTrue(trigger_hidden),
-        disabled: isTrue(trigger_disabled),
-        variant: trigger_variant,
-        text: trigger_text,
-        title: trigger_title,
-        size: trigger_size,
-        icon: trigger_icon,
-        icon_position: trigger_icon_position,
-        class: trigger_class,
-        ...trigger_attributes,
-      } as ButtonProps
+      const triggerAttributes = (
+        trigger_attributes ? { ...trigger_attributes } : {}
+      ) as ButtonProps
+
       if (isTrue(disabled)) {
         triggerAttributes.disabled = true
       }