🐛 fix: 移除 use-merge-value 以修正 hooks bug

arvinxx · Jun 18, 2021 · 9e72f6a · 9e72f6a
1 parent dd352a6
commit 9e72f6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/asset-gallery/package.json b/packages/asset-gallery/package.json
@@ -30,7 +30,6 @@
     "antd": "^4.14.0",
     "copy-to-clipboard": "^3.3.1",
     "js-yaml": "^4.1.0",
-    "styled-components": "^5.3.0",
-    "use-merge-value": "^1.0.2"
+    "styled-components": "^5.3.0"
   }
 }
diff --git a/packages/asset-gallery/src/AssetGallery.tsx b/packages/asset-gallery/src/AssetGallery.tsx
@@ -1,6 +1,6 @@
 import type { FC } from 'react';
-import React from 'react';
-import useMergeValue from 'use-merge-value';
+import React, { useState } from 'react';
+// import useMergeValue from 'use-merge-value';
 
 import Layout from './Layout';
 
@@ -45,11 +45,11 @@ const AssetGallery: FC<AssetGalleryProps> = ({
   data,
   darkBackground,
   layout = 'masonry',
-  grid = { columns: 1, showSlider: true },
+  grid = { showSlider: true },
 }) => {
-  const imageList = typeof data === 'string' ? YMLToJSON(data).data : data;
+  const [columns, setColumn] = useState(1);
 
-  const [columns, setColumn] = useMergeValue(grid.columns);
+  const imageList = typeof data === 'string' ? YMLToJSON(data).data : data;
 
   return (
     <Layout