fix: remove FormRow context support from components not using FormRow (#2103)

tujoworker · web-flow · commit 3a39134c883e · 2023-03-16T11:44:38.000+01:00
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/components/autocomplete/demos.md b/packages/dnb-design-system-portal/src/docs/uilib/components/autocomplete/demos.md
@@ -86,10 +86,10 @@ const data = [
 
 <AutocompleteCustomWidth />
 
-<AutocompleteOpened />
-
-<AutocompleteDisabledExample />
-
 ### Autocomplete with status message
 
 <AutocompleteStatusExample />
+
+<AutocompleteOpened />
+
+<AutocompleteDisabledExample />
diff --git a/packages/dnb-eufemia/src/components/accordion/AccordionProvider.js b/packages/dnb-eufemia/src/components/accordion/AccordionProvider.js
@@ -19,7 +19,6 @@ import {
   accordionPropTypes,
   accordionDefaultProps,
 } from './AccordionPropTypes'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 
 import Context from '../../shared/Context'
 import AccordionGroupContext from './AccordionProviderContext'
@@ -71,7 +70,6 @@ export default class AccordionGroup extends React.PureComponent {
     const props = extendPropsWithContextInClassComponent(
       this.props,
       AccordionGroup.defaultProps,
-      includeValidProps(this.context.FormRow),
       this.context.Accordion,
       this.context.getTranslation(this.props).Accordion
     )
diff --git a/packages/dnb-eufemia/src/components/autocomplete/__tests__/__snapshots__/autocomplete-screenshot-test-js-autocomplete-screenshot-have-to-match-small-screen-autocomplete-with-suffix-value-1-1e7f2.snap.png b/packages/dnb-eufemia/src/components/autocomplete/__tests__/__snapshots__/autocomplete-screenshot-test-js-autocomplete-screenshot-have-to-match-small-screen-autocomplete-with-suffix-value-1-1e7f2.snap.png
diff --git a/packages/dnb-eufemia/src/components/button/Button.js b/packages/dnb-eufemia/src/components/button/Button.js
@@ -26,7 +26,6 @@ import {
   skeletonDOMAttributes,
   createSkeletonClass,
 } from '../skeleton/SkeletonHelper'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 import IconPrimary from '../icon-primary/IconPrimary'
 import { launch, launch_medium } from '../../icons'
 import FormStatus from '../form-status/FormStatus'
@@ -98,7 +97,6 @@ export default class Button extends React.PureComponent {
       this.props,
       Button.defaultProps,
       { skeleton: this.context?.skeleton },
-      includeValidProps(this.context.FormRow),
       this.context.Button
     )
 
diff --git a/packages/dnb-eufemia/src/components/help-button/HelpButtonInstance.tsx b/packages/dnb-eufemia/src/components/help-button/HelpButtonInstance.tsx
@@ -10,7 +10,6 @@ import {
   extendPropsWithContext,
 } from '../../shared/component-helper'
 import Context from '../../shared/Context'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 import { createSpacingClasses } from '../space/SpacingHelper'
 import Button, { ButtonProps } from '../button/Button'
 
@@ -26,7 +25,6 @@ export default function HelpButtonInstance(localProps: ButtonProps) {
   const props = extendPropsWithContext(
     localProps,
     defaultProps,
-    includeValidProps(context.FormRow),
     context.HelpButton
   )
 
diff --git a/packages/dnb-eufemia/src/components/icon-primary/IconPrimary.js b/packages/dnb-eufemia/src/components/icon-primary/IconPrimary.js
@@ -8,7 +8,6 @@ import React from 'react'
 import PropTypes from 'prop-types' // Is needed because of ts types
 import Context from '../../shared/Context'
 import { extendPropsWithContextInClassComponent } from '../../shared/component-helper'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 import DefaultIcon, {
   iconPropTypes,
   DefaultIconSize,
@@ -50,7 +49,6 @@ export default class IconPrimary extends React.PureComponent {
       this.props,
       IconPrimary.defaultProps,
       { skeleton: this.context?.skeleton },
-      includeValidProps(this.context.FormRow),
       this.context.Icon,
       this.context.IconPrimary
     )
diff --git a/packages/dnb-eufemia/src/components/icon/Icon.js b/packages/dnb-eufemia/src/components/icon/Icon.js
@@ -21,7 +21,6 @@ import {
 import { createSkeletonClass } from '../skeleton/SkeletonHelper'
 import Context from '../../shared/Context'
 import { iconCase } from './IconHelpers'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 
 export const DefaultIconSize = 16
 export const DefaultIconSizes = {
@@ -126,7 +125,6 @@ export default class Icon extends React.PureComponent {
       this.props,
       Icon.defaultProps,
       { skeleton: this.context?.skeleton },
-      includeValidProps(this.context.FormRow),
       this.context.Icon
     )
 
diff --git a/packages/dnb-eufemia/src/components/logo/Logo.js b/packages/dnb-eufemia/src/components/logo/Logo.js
@@ -12,7 +12,6 @@ import {
   registerElement,
   extendPropsWithContextInClassComponent,
 } from '../../shared/component-helper'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 import {
   spacingPropTypes,
   createSpacingClasses,
@@ -59,7 +58,6 @@ export default class Logo extends React.PureComponent {
       this.props,
       Logo.defaultProps,
       this.context.getTranslation(this.props).Logo,
-      includeValidProps(this.context.FormRow),
       this.context.Logo
     )
 
diff --git a/packages/dnb-eufemia/src/components/modal/Modal.tsx b/packages/dnb-eufemia/src/components/modal/Modal.tsx
@@ -33,7 +33,6 @@ import {
   ToCamelCasePartial,
 } from '../../shared/helpers/withCamelCaseProps'
 import { ButtonProps } from '../button/Button'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 
 export const ANIMATION_DURATION = 300
 
@@ -410,7 +409,6 @@ class Modal extends React.PureComponent<
       this.props,
       Modal.defaultProps,
       this.context.getTranslation(this.props).Modal,
-      includeValidProps(this.context.FormRow),
       this.context.Modal
     )
 
diff --git a/packages/dnb-eufemia/src/components/pagination/Pagination.js b/packages/dnb-eufemia/src/components/pagination/Pagination.js
@@ -13,7 +13,6 @@ import {
   validateDOMAttributes,
   extendPropsWithContextInClassComponent,
 } from '../../shared/component-helper'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 import {
   spacingPropTypes,
   createSpacingClasses,
@@ -185,7 +184,6 @@ class PaginationInstance extends React.PureComponent {
       this.props,
       paginationDefaultProps,
       this.context.getTranslation(this.props).Pagination,
-      includeValidProps(this.context.FormRow),
       this.context.Pagination
     )
 
diff --git a/packages/dnb-eufemia/src/components/progress-indicator/ProgressIndicator.js b/packages/dnb-eufemia/src/components/progress-indicator/ProgressIndicator.js
@@ -14,7 +14,6 @@ import {
   dispatchCustomElementEvent,
   extendPropsWithContextInClassComponent,
 } from '../../shared/component-helper'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 import {
   spacingPropTypes,
   createSpacingClasses,
@@ -119,7 +118,6 @@ export default class ProgressIndicator extends React.PureComponent {
       this.props,
       ProgressIndicator.defaultProps,
       this.context.getTranslation(this.props).ProgressIndicator,
-      includeValidProps(this.context.FormRow),
       this.context.ProgressIndicator
     )
 
diff --git a/packages/dnb-eufemia/src/components/step-indicator/StepIndicatorContext.js b/packages/dnb-eufemia/src/components/step-indicator/StepIndicatorContext.js
@@ -12,7 +12,6 @@ import {
   extendPropsWithContextInClassComponent,
 } from '../../shared/component-helper'
 import { onMediaQueryChange } from '../../shared/MediaQueryUtils'
-import { includeValidProps } from '../form-row/FormRowHelpers'
 
 // We use this array to filter out unwanted
 const filterAttributes = Object.keys(stepIndicatorDefaultProps)
@@ -198,7 +197,6 @@ export class StepIndicatorProvider extends React.PureComponent {
       stepIndicatorDefaultProps,
       { skeleton: context?.skeleton },
       context.getTranslation(context).StepIndicator,
-      includeValidProps(context.FormRow),
       context.StepIndicator
     )
 
diff --git a/packages/dnb-eufemia/src/elements/Element.tsx b/packages/dnb-eufemia/src/elements/Element.tsx
@@ -16,7 +16,6 @@ import {
   skeletonDOMAttributes,
   SkeletonMethods,
 } from '../components/skeleton/SkeletonHelper'
-import { includeValidProps } from '../components/form-row/FormRowHelpers'
 
 import type { DynamicElement, SpacingProps } from '../shared/types'
 
@@ -68,12 +67,9 @@ const Element = React.forwardRef((props: ElementAllProps, ref) => {
 
 function ElementInstance(localProps: ElementAllProps) {
   const context = React.useContext(Context)
-  const props = extendPropsWithContext(
-    localProps,
-    defaultProps,
-    { skeleton: context?.skeleton },
-    includeValidProps(context?.FormRow)
-  )
+  const props = extendPropsWithContext(localProps, defaultProps, {
+    skeleton: context?.skeleton,
+  })
 
   // deprecated
   if (typeof props.inner_ref !== 'undefined') {
diff --git a/packages/dnb-eufemia/src/fragments/drawer-list/DrawerList.js b/packages/dnb-eufemia/src/fragments/drawer-list/DrawerList.js
@@ -16,7 +16,6 @@ import {
   dispatchCustomElementEvent,
 } from '../../shared/component-helper'
 import { createSpacingClasses } from '../../components/space/SpacingHelper'
-import { includeValidProps } from '../../components/form-row/FormRowHelpers'
 
 import DrawerListContext from './DrawerListContext'
 import DrawerListProvider from './DrawerListProvider'
@@ -151,9 +150,7 @@ class DrawerListInstance extends React.PureComponent {
     const props = extendPropsWithContextInClassComponent(
       this.props,
       DrawerList.defaultProps,
-      this.context.getTranslation(this.props).DrawerList,
-      includeValidProps(this.context.FormRow),
-      this.context.DrawerList
+      this.context.getTranslation(this.props).DrawerList
     )
 
     const {
