refactor: 调整 withAMap 的实现方式

xyy94813 · Nov 11, 2023 · 36beca2 · 36beca2
1 parent de4c4da
commit 36beca2
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 18 deletions.
diff --git a/src/components/AMapCircle/stories/AMapCircle.stories.tsx b/src/components/AMapCircle/stories/AMapCircle.stories.tsx
@@ -28,7 +28,7 @@ export default {
   title: '组件(Components)/覆盖物(Overlay)/AMapCircle',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapControlBar/stories/AMapControlBar.stories.tsx b/src/components/AMapControlBar/stories/AMapControlBar.stories.tsx
@@ -14,7 +14,7 @@ export default {
   title: '组件(Components)/地图控件(Control)/AMapControlBar',
   component: AMapControlBar,
   decorators: [
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapEllipse/stories/AMapEllipse.stories.tsx b/src/components/AMapEllipse/stories/AMapEllipse.stories.tsx
@@ -28,7 +28,7 @@ export default {
   title: '组件(Components)/覆盖物(Overlay)/AMapEllipse',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapGeoJSON/stories/AMapGeoJSON.stories.tsx b/src/components/AMapGeoJSON/stories/AMapGeoJSON.stories.tsx
@@ -102,7 +102,7 @@ export default {
   title: '组件(Components)/覆盖物(Overlay)/AMapGeoJSON',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapHawkEye/stories/AMapHawkEye.stories.tsx b/src/components/AMapHawkEye/stories/AMapHawkEye.stories.tsx
@@ -14,7 +14,7 @@ export default {
   title: '组件(Components)/地图控件(Control)/AMapHawkEye',
   component: AMapHawkEye,
   decorators: [
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapMapType/stories/AMapMapType.stories.tsx b/src/components/AMapMapType/stories/AMapMapType.stories.tsx
@@ -14,7 +14,7 @@ export default {
   title: '组件(Components)/地图控件(Control)/AMapMapType',
   component: AMapMapType,
   decorators: [
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapMarker/stories/AMapMarker.stories.tsx b/src/components/AMapMarker/stories/AMapMarker.stories.tsx
@@ -41,7 +41,7 @@ export default {
   component: AMapMarker,
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapMouseTool/stories/AMapMouseTool.stories.tsx b/src/components/AMapMouseTool/stories/AMapMouseTool.stories.tsx
@@ -13,7 +13,7 @@ const eventHandler = actions('onCompleted');
 export default {
   title: '组件(Components)/工具(Tools)/AMapMouseTool',
   decorators: [
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapOverlayGroup/stories/AMapOverlayGroup.stories.tsx b/src/components/AMapOverlayGroup/stories/AMapOverlayGroup.stories.tsx
@@ -35,7 +35,7 @@ export default {
   title: '组件(Components)/覆盖物(Overlay)/AMapOverlayGroup',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapPolygon/stories/AMapPolygon.stories.tsx b/src/components/AMapPolygon/stories/AMapPolygon.stories.tsx
@@ -38,7 +38,7 @@ export default {
   title: '组件(Components)/覆盖物(Overlay)/AMapPolygon',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapPolygonEditor/stories/AMapPolygonEditor.stories.tsx b/src/components/AMapPolygonEditor/stories/AMapPolygonEditor.stories.tsx
@@ -99,7 +99,7 @@ export default {
   title: '组件(Components)/工具(Tools)/AMapPolygonEditor',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapPolyline/stories/AMapPolyline.stories.tsx b/src/components/AMapPolyline/stories/AMapPolyline.stories.tsx
@@ -36,7 +36,7 @@ export default {
   title: '组件(Components)/覆盖物(Overlay)/AMapPolyline',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapPolylineEditor/stories/AMapPolylineEditor.stories.tsx b/src/components/AMapPolylineEditor/stories/AMapPolylineEditor.stories.tsx
@@ -41,7 +41,7 @@ export default {
   title: '组件(Components)/工具(Tools)/AMapPolylineEditor',
   decorators: [
     withAutoFitView,
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapScale/stories/AMapScale.stories.tsx b/src/components/AMapScale/stories/AMapScale.stories.tsx
@@ -14,7 +14,7 @@ export default {
   title: '组件(Components)/地图控件(Control)/AMapScale',
   component: AMapScale,
   decorators: [
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/components/AMapToolBar/stories/AMapToolBar.stories.tsx b/src/components/AMapToolBar/stories/AMapToolBar.stories.tsx
@@ -14,7 +14,7 @@ export default {
   title: '组件(Components)/地图控件(Control)/AMapToolBar',
   component: AMapToolBar,
   decorators: [
-    withAMap,
+    withAMap(),
     withAMapContainer,
     withAPIContainer,
   ],

diff --git a/src/storybook-decorators/withAMap.tsx b/src/storybook-decorators/withAMap.tsx
@@ -1,10 +1,11 @@
 import * as React from 'react';
 import type { Story } from '@storybook/react';
 
-import { AMapMap } from '../index';
+import { AMapMap, AMapMapProps } from '../index';
 
-const withAMap = (renderStory: Story, context: any) => (
-  <AMapMap>{renderStory({}, context)}</AMapMap>
+const withAMap = (mapProps: AMapMapProps = {}) => (renderStory: Story, context: any) => (
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  <AMapMap {...mapProps}>{renderStory({}, context)}</AMapMap>
 );
 
 export default withAMap;