fix: fix tertiary #button with component given and icon_position left

packages/dnb-design-system-portal/src/docs/uilib/components/button/demos.md

@@ -98,7 +98,7 @@ import { bell_medium as Bell, question } from 'dnb-ui-lib/src/icons'
 
 ### Tertiary button
 
-<ComponentBox>
+<ComponentBox data-visual-test="button-tertiary-all">
 	{
 	/* @jsx */ `
 <Button
@@ -108,11 +108,19 @@ import { bell_medium as Bell, question } from 'dnb-ui-lib/src/icons'
   icon="chevron_left"
   data-visual-test="button-tertiary"
 />
+<Button
+  variant="tertiary"
+  text={<span>Text inside additional span</span>}
+  icon_position="left"
+  icon="chevron_left"
+  left
+/>
 <Button
   variant="tertiary"
   text="With medium icon"
   icon="chevron_right"
   icon_size="medium"
+  left
 />
 	`
 	}

packages/dnb-ui-lib/src/components/button/Button.js

@@ -216,9 +216,14 @@ export default class Button extends React.PureComponent {
     let usedVariant = variant
     let usedSize = size
     let iconSize = icon_size
-    let content = Button.getContent(this.props) || text
+    const content = Button.getContent(this.props)
 
-    if (variant === 'tertiary' && content && !icon && icon !== false) {
+    if (
+      variant === 'tertiary' &&
+      (content || text) &&
+      !icon &&
+      icon !== false
+    ) {
       warn(
         `A Tertiary Button requires an icon. Please declare an icon to: ${content}`
       )
@@ -373,11 +378,7 @@ class Content extends React.PureComponent {
       )
     }
 
-    if (
-      typeof content === 'string'
-      // ||
-      // (Array.isArray(content) && typeof content[0] === 'string')
-    ) {
+    if (typeof content === 'string') {
       text = content
     } else if (content) {
       ret.push(content)

packages/dnb-ui-lib/src/components/button/__tests__/Button.screenshot.test.js

@@ -142,6 +142,12 @@ describe('Button tertiary screenshot', () => {
     })
     expect(screenshot).toMatchImageSnapshot()
   })
+  it('have to match all tertiary buttons', async () => {
+    const screenshot = await testPageScreenshot({
+      selector: '[data-visual-test="button-tertiary-all"]'
+    })
+    expect(screenshot).toMatchImageSnapshot()
+  })
 })
 
 describe('Button signal screenshot', () => {

packages/dnb-ui-lib/src/components/global-error/__tests__/__snapshots__/GlobalError.test.js.snap

@@ -599,7 +599,7 @@ exports[`GlobalError snapshot have to match component snapshot 1`] = `
             bounding={false}
             class={null}
             className="dnb-global-error__back"
-            content="back"
+            content={null}
             custom_element={null}
             custom_method={null}
             disabled={null}

packages/dnb-ui-lib/src/components/global-status/__tests__/__snapshots__/GlobalStatus.test.js.snap

@@ -915,7 +915,7 @@ exports[`GlobalStatus snapshot have to match component snapshot 1`] = `
                       bounding={false}
                       class={null}
                       className="dnb-global-status__close-button"
-                      content="close_text"
+                      content={null}
                       custom_element={null}
                       custom_method={null}
                       disabled={null}
@@ -1230,7 +1230,7 @@ Array [
                         bounding={false}
                         class={null}
                         className="dnb-global-status__close-button"
-                        content="Lukk"
+                        content={null}
                         custom_element={null}
                         custom_method={null}
                         disabled={null}

packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap

@@ -658,7 +658,7 @@ exports[`Modal component have to match snapshot 1`] = `
                         bounding={false}
                         class={null}
                         className="dnb-modal__close-button"
-                        content="close_title"
+                        content={null}
                         custom_element={null}
                         custom_method={null}
                         disabled={null}

packages/dnb-ui-lib/stories/components/Button.js

@@ -151,6 +151,12 @@ export const ButtonSandbox = () => (
         icon_position="left"
         icon="chevron_left"
       />
+      <Button
+        text={<span>Button text in span</span>}
+        variant="tertiary"
+        icon_position="left"
+        icon="chevron_left"
+      />
       <Button text="Button text" variant="tertiary" icon="chevron_right" />
       <Button
         text="Button text"