🚚 chore: 移动组件目录

Author: arvinxx

packages/sortable-list/package.json

@@ -27,8 +27,9 @@
     "@dnd-kit/core": "^5.0.1",
     "@dnd-kit/modifiers": "^5.0.0",
     "@dnd-kit/sortable": "^6.0.0",
+    "antd": "^4.18.9",
     "classnames": "^2.3.1",
     "lodash.isequal": "^4.5.0",
-    "use-merge-value": "^1.0.2"
+    "zustand": "^3.7.1"
   }
 }

packages/sortable-list/src/Sortable.tsx

@@ -1,4 +1,5 @@
-@background-color: #fff;
+@import (reference) '~antd/es/style/themes/default.less';
+
 @border-color: #efefef;
 @handle-color: rgba(0, 0, 0, 0.25);
 @box-shadow-border: 0 0 0 calc(1px / var(--scale-x, 1)) hsla(240, 0%, 26%, 0.05);
@@ -54,7 +55,7 @@
     flex-grow: 1;
     align-items: center;
     padding: 16px 24px;
-    background-color: @background-color;
+    background-color: @component-background;
     box-shadow: @box-shadow;
     outline: none;
     border-radius: 4px;

packages/sortable-list/src/BaseItem/index.less renamed to packages/sortable-list/src/components/BaseItem/index.less

@@ -2,9 +2,10 @@ import type { CSSProperties } from 'react';
 import React, { forwardRef, memo, useEffect } from 'react';
 import classNames from 'classnames';
 
-import { Handle, Remove } from '../components';
+import { Handle } from '../Handle';
+import { Remove } from '../Remove';
 
-import type { BaseItemProps } from '../types';
+import type { BaseItemProps } from '../../types';
 
 import './index.less';
 

packages/sortable-list/src/BaseItem/index.tsx renamed to packages/sortable-list/src/components/BaseItem/index.tsx

@@ -3,7 +3,7 @@ import { DragOverlay } from '@dnd-kit/core';
 import { Item } from './BaseItem';
 import type { FC } from 'react';
 
-import type { DraggingOverlayProps } from './types';
+import type { DraggingOverlayProps } from '../types';
 
 const DraggingOverlay: FC<DraggingOverlayProps> = ({
   dragging,

packages/sortable-list/src/DraggingOverlay.tsx renamed to packages/sortable-list/src/components/DraggingOverlay.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 import { useSortable } from '@dnd-kit/sortable';
 
 import { Item } from './BaseItem';
-import type { SortableItemProps } from './types';
+import type { SortableItemProps } from '../types';
 
 const SortableItem: FC<SortableItemProps> = ({
   //数据

packages/sortable-list/src/SortableItem.tsx renamed to packages/sortable-list/src/components/SortableItem.tsx

@@ -1,3 +1,4 @@
 export { Action } from './Action';
 export { Handle } from './Handle';
 export { Remove } from './Remove';
+export { Item } from './BaseItem';

packages/sortable-list/src/components/index.ts

@@ -0,0 +1,26 @@
+import type { FC } from 'react';
+import React from 'react';
+
+import { Provider, createStore, useStoreApi } from '../store';
+
+const Wrapper: FC = ({ children }) => {
+  let isWrapped = true;
+
+  try {
+    useStoreApi();
+  } catch (e) {
+    isWrapped = false;
+  }
+
+  if (isWrapped) {
+    // we need to wrap it with a fragment because it's not allowed for children to be a ReactNode
+    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18051
+    return <>{children}</>;
+  }
+
+  return <Provider createStore={createStore}>{children}</Provider>;
+};
+
+Wrapper.displayName = 'ExcelTableWrapper';
+
+export default Wrapper;