feat: delete _EXPERIMENTAL_memoContext props (#27)

gravity-ui · Nov 16, 2022 · c9d6b64 · c9d6b64
1 parent 55c4d96
commit c9d6b64
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 274 deletions.
diff --git a/src/components/DashKit/DashKit.tsx b/src/components/DashKit/DashKit.tsx
@@ -33,7 +33,6 @@ interface DashKitDefaultProps {
     noOverlay?: boolean;
     draggableHandleClassName?: string;
     _EXPERIMENTAL_preventDoubleCompact?: boolean;
-    _EXPERIMENTAL_memoContext?: boolean;
 }
 
 export interface DashKitProps extends DashKitGeneralProps, Partial<DashKitDefaultProps> {}
@@ -55,7 +54,6 @@ export class DashKit extends React.PureComponent<DashKitInnerProps> {
         },
         context: {},
         noOverlay: false,
-        _EXPERIMENTAL_memoContext: false,
     };
 
     static registerPlugins(...plugins: Plugin[]) {

diff --git a/src/components/DashKit/__stories__/DashKitShowcase.tsx b/src/components/DashKit/__stories__/DashKitShowcase.tsx
@@ -22,7 +22,6 @@ type DashKitDemoState = {
     customControlsActionData: number;
     showCustomMenu: boolean;
     _EXPERIMENTAL_preventDoubleCompact: boolean;
-    _EXPERIMENTAL_memoContext: boolean;
 };
 
 export class DashKitShowcase extends React.Component<{}, DashKitDemoState> {
@@ -41,7 +40,6 @@ export class DashKitShowcase extends React.Component<{}, DashKitDemoState> {
         customControlsActionData: 0,
         showCustomMenu: true,
         _EXPERIMENTAL_preventDoubleCompact: false,
-        _EXPERIMENTAL_memoContext: false,
     };
 
     private dashKitRef = React.createRef<DashKit>();
@@ -138,7 +136,6 @@ export class DashKitShowcase extends React.Component<{}, DashKitDemoState> {
                         _EXPERIMENTAL_preventDoubleCompact={
                             this.state._EXPERIMENTAL_preventDoubleCompact
                         }
-                        _EXPERIMENTAL_memoContext={this.state._EXPERIMENTAL_memoContext}
                     />
                 </Demo.Row>
             </Demo>

diff --git a/src/components/DashKitView/DashKitView.js b/src/components/DashKitView/DashKitView.js
@@ -3,7 +3,7 @@ import block from 'bem-cn-lite';
 import {DashKitContext} from '../../context/DashKitContext';
 import GridLayout from '../GridLayout/GridLayout';
 import MobileLayout from '../MobileLayout/MobileLayout';
-import {withContext, withMemoContext} from '../../hocs/withContext';
+import {withContext} from '../../hocs/withContext';
 import {useCalcPropsLayout} from '../../hooks/useCalcLayout';
 
 import './DashKitView.scss';
@@ -25,16 +25,10 @@ function DashKitView(props) {
 }
 
 const DashKitViewWithContext = withContext(DashKitView);
-const DashKitViewWithMemoContext = withMemoContext(DashKitView);
 
 const DashKitViewForwardedMeta = React.forwardRef((props, ref) => {
     const layout = useCalcPropsLayout(props.config, props.registerManager);
-
-    return props._EXPERIMENTAL_memoContext ? (
-        <DashKitViewWithMemoContext {...props} layout={layout} forwardedMetaRef={ref} />
-    ) : (
-        <DashKitViewWithContext {...props} layout={layout} forwardedMetaRef={ref} />
-    );
+    return <DashKitViewWithContext {...props} layout={layout} forwardedMetaRef={ref} />;
 });
 
 DashKitViewForwardedMeta.displayName = 'DashKitViewForwardedMeta';

diff --git a/src/components/GridLayout/GridLayout.js b/src/components/GridLayout/GridLayout.js
@@ -42,7 +42,7 @@ export default class GridLayout extends React.PureComponent {
     };
 
     adjustWidgetLayout = ({widgetId, needSetDefault, adjustedWidgetLayout}) => {
-        const {getLayout, memorizeOriginalLayout, revertToOriginalLayout} = this.context;
+        const {layout, memorizeOriginalLayout, revertToOriginalLayout} = this.context;
 
         if (needSetDefault) {
             revertToOriginalLayout(widgetId);
@@ -53,7 +53,6 @@ export default class GridLayout extends React.PureComponent {
             return;
         }
 
-        const layout = getLayout();
         const correspondedLayoutItemIndex = layout.findIndex(
             (layoutItem) => layoutItem.i === widgetId,
         );
@@ -106,10 +105,10 @@ export default class GridLayout extends React.PureComponent {
     };
 
     render() {
-        const {getLayout, config, registerManager, editMode, noOverlay, draggableHandleClassName} =
+        const {layout, config, registerManager, editMode, noOverlay, draggableHandleClassName} =
             this.context;
         this.pluginsRefs.length = config.items.length;
-        const layout = getLayout();
+
         return (
             <Layout
                 {...registerManager.gridLayout}

diff --git a/src/components/MobileLayout/MobileLayout.js b/src/components/MobileLayout/MobileLayout.js
@@ -48,7 +48,7 @@ export default class MobileLayout extends React.PureComponent {
     };
 
     render() {
-        const {config, getLayout} = this.context;
+        const {config, layout} = this.context;
 
         this.pluginsRefs.length = config.items.length;
 
@@ -68,7 +68,7 @@ export default class MobileLayout extends React.PureComponent {
                             <Item
                                 id={item.id}
                                 item={item}
-                                layout={getLayout()}
+                                layout={layout}
                                 shouldItemUpdate={false}
                                 adjustWidgetLayout={this.adjustWidgetLayout.bind(this, index)}
                                 forwardedPluginRef={(pluginRef) => {