From 9e72f6a1e704fed91020416d1a639fa093d19fd1 Mon Sep 17 00:00:00 2001
From: Arvin Xu <arvinx@foxmail.com>
Date: Fri, 18 Jun 2021 13:59:25 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20fix:=20=E7=A7=BB=E9=99=A4=20use-merge-v?=
 =?UTF-8?q?alue=20=E4=BB=A5=E4=BF=AE=E6=AD=A3=20hooks=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/asset-gallery/package.json         |  3 +--
 packages/asset-gallery/src/AssetGallery.tsx | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/asset-gallery/package.json b/packages/asset-gallery/package.json
index 850bd280..5103d119 100644
--- 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
index 98aa7e92..e8d958a1 100644
--- 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