x-star-design 0.0.68 → 0.0.70

package/dist/aliplayer/index.d.ts

@@ -5,8 +5,10 @@ import React from 'react';
 export interface AliplayerConfig {
     vid: string;
     playauth: string;
-    autoplay: boolean;
-    language: string;
+    autoplay?: boolean;
+    language?: string;
+    encryptType?: number;
+    keyShortCuts?: boolean;
 }
 /**
  * Aliplayer 实例

package/dist/aliplayer/index.js

@@ -23,13 +23,13 @@ var Aliplayer = function Aliplayer(_ref) {
   var importAliPlayer = function importAliPlayer() {
     var link = window.document.createElement('link');
     link.rel = 'stylesheet';
-    link.href = 'https://g.alicdn.com/de/prismplayer/2.11.0/skins/default/aliplayer-min.css';
-    var scirpt = window.document.createElement('script');
-    scirpt.type = 'text/javascript';
-    scirpt.src = 'https://g.alicdn.com/de/prismplayer/2.11.0/aliplayer-h5-min.js';
+    link.href = 'https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css';
+    var script = window.document.createElement('script');
+    script.type = 'text/javascript';
+    script.src = 'https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-h5-min.js';
     var head = window.document.querySelector('head');
     head === null || head === void 0 ? void 0 : head.append(link);
-    head === null || head === void 0 ? void 0 : head.append(scirpt);
+    head === null || head === void 0 ? void 0 : head.append(script);
   };
   if (!window.Aliplayer) {
     importAliPlayer();
@@ -48,7 +48,10 @@ var Aliplayer = function Aliplayer(_ref) {
         var Aliplayer = window.Aliplayer;
         if (Aliplayer) {
           // 创建 Aliplayer 实例
-          player.current = new Aliplayer(_objectSpread(_objectSpread({}, config), {}, {
+          player.current = new Aliplayer(_objectSpread(_objectSpread({
+            encryptType: 1,
+            keyShortCuts: true
+          }, config), {}, {
             id: id
           }), function (player) {
             return onCreate === null || onCreate === void 0 ? void 0 : onCreate(player);

package/dist/micro-app/index.d.ts

@@ -7,9 +7,10 @@ interface MicroAppProps {
     entry: string;
     pathname: string;
     microProps?: Record<string, unknown>;
+    fallback?: React.ReactNode;
 }
 declare const MicroApp: {
-    ({ className, style, name, entry, pathname, microProps, }: MicroAppProps): React.JSX.Element;
+    ({ className, style, name, entry, pathname, microProps, fallback, }: MicroAppProps): React.JSX.Element;
     useGlobalState({ lang, setLang, }: {
         lang: 'zh' | 'en';
         setLang: (lang?: 'zh' | 'en') => void;

package/dist/micro-app/index.js

@@ -13,7 +13,8 @@ var MicroApp = function MicroApp(_ref) {
     name = _ref.name,
     entry = _ref.entry,
     pathname = _ref.pathname,
-    microProps = _ref.microProps;
+    microProps = _ref.microProps,
+    fallback = _ref.fallback;
   var microAppId = useMemo(function () {
     return "microapp-".concat(randomString(8));
   }, []);
@@ -79,9 +80,9 @@ var MicroApp = function MicroApp(_ref) {
       position: 'relative',
       minHeight: 600
     }, style)
-  }, loading && /*#__PURE__*/React.createElement(RainbowCat, {
+  }, loading && (fallback !== undefined ? fallback : /*#__PURE__*/React.createElement(RainbowCat, {
     text: t('Loading')
-  }));
+  })));
 };
 MicroApp.useGlobalState = function (_ref2) {
   var lang = _ref2.lang,

package/dist/sort-table/index.d.ts

@@ -1,7 +1,7 @@
 import type { TableProps } from 'antd';
 import React from 'react';
 interface SortTableProps<RecordType> extends TableProps<RecordType> {
-    onSortEnd?: (newDataSource: RecordType[]) => void;
+    onSortEnd?: (data: RecordType[]) => void;
 }
-declare const SortTable: <RecordType extends Record<string, unknown>>(props: SortTableProps<RecordType>) => React.JSX.Element;
+declare const SortTable: <RecordType extends Record<string | number | symbol, any>>(props: SortTableProps<RecordType>) => React.JSX.Element;
 export default SortTable;

package/dist/sort-table/index.js

@@ -1,95 +1,108 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { MenuOutlined } from '@ant-design/icons';
-import { Table } from 'antd';
-import React, { useRef } from 'react';
-import { SortableContainer, SortableElement, SortableHandle } from 'react-sortable-hoc';
-import ConfigProviderWrapper from "../config-provider-wrapper";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _extends from "@babel/runtime/helpers/esm/extends";
+import { HolderOutlined } from '@ant-design/icons';
+import { DndContext } from '@dnd-kit/core';
+import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
+import { SortableContext, arrayMove, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import { Button, Table } from 'antd';
+import React, { useContext, useMemo } from 'react';
+var RowContext = /*#__PURE__*/React.createContext({});
+var DragHandle = function DragHandle() {
+  var _useContext = useContext(RowContext),
+    setActivatorNodeRef = _useContext.setActivatorNodeRef,
+    listeners = _useContext.listeners;
+  return /*#__PURE__*/React.createElement(Button, _extends({
+    "data-testid": "dragHandle",
+    ref: setActivatorNodeRef,
+    style: {
+      cursor: 'move'
+    },
+    type: "text",
+    size: "small",
+    icon: /*#__PURE__*/React.createElement(HolderOutlined, null)
+  }, listeners));
+};
+var Row = function Row(props) {
+  var _useSortable = useSortable({
+      id: props['data-row-key']
+    }),
+    attributes = _useSortable.attributes,
+    listeners = _useSortable.listeners,
+    setNodeRef = _useSortable.setNodeRef,
+    setActivatorNodeRef = _useSortable.setActivatorNodeRef,
+    transform = _useSortable.transform,
+    transition = _useSortable.transition,
+    isDragging = _useSortable.isDragging;
+  var style = _objectSpread(_objectSpread({}, props.style), {}, {
+    transform: CSS.Translate.toString(transform),
+    transition: transition
+  }, isDragging ? {
+    position: 'relative',
+    zIndex: 9999
+  } : {});
+  var contextValue = useMemo(function () {
+    return {
+      setActivatorNodeRef: setActivatorNodeRef,
+      listeners: listeners
+    };
+  }, [setActivatorNodeRef, listeners]);
+  return /*#__PURE__*/React.createElement(RowContext.Provider, {
+    value: contextValue
+  }, /*#__PURE__*/React.createElement("tr", _extends({
+    "data-testid": "tableRow"
+  }, props, {
+    ref: setNodeRef,
+    style: style
+  }, attributes)));
+};
 var SortTable = function SortTable(props) {
   var _props$columns;
-  var _props$dataSource = props.dataSource,
-    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
-    rowKey = props.rowKey,
-    onEnd = props.onSortEnd;
-  var DragHandle = SortableHandle(function () {
-    return /*#__PURE__*/React.createElement(MenuOutlined, {
-      style: {
-        cursor: 'grab',
-        color: '#999'
-      },
-      "data-testid": "dragHandle"
-    });
-  });
-  var newColumns = [{
-    title: 'Sort',
-    dataIndex: 'sort',
+  var _props$rowKey = props.rowKey,
+    rowKey = _props$rowKey === void 0 ? 'key' : _props$rowKey,
+    _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource;
+  var getKey = function getKey(record) {
+    return typeof rowKey === 'function' ? rowKey(record) : record[rowKey];
+  };
+  var onDragEnd = function onDragEnd(_ref) {
+    var active = _ref.active,
+      over = _ref.over;
+    if (over && active.id !== over.id) {
+      var _props$onSortEnd;
+      var activeIndex = dataSource.findIndex(function (record) {
+        return getKey(record) === active.id;
+      });
+      var overIndex = dataSource.findIndex(function (record) {
+        return getKey(record) === over.id;
+      });
+      (_props$onSortEnd = props.onSortEnd) === null || _props$onSortEnd === void 0 ? void 0 : _props$onSortEnd.call(props, arrayMove(dataSource, activeIndex, overIndex));
+    }
+  };
+  var columns = [{
+    key: 'sort',
     align: 'center',
     width: 80,
-    ellipsis: true,
-    className: 'drag-visible',
     render: function render() {
       return /*#__PURE__*/React.createElement(DragHandle, null);
     }
   }].concat(_toConsumableArray((_props$columns = props.columns) !== null && _props$columns !== void 0 ? _props$columns : []));
-  var SortableItem = SortableElement(function (props) {
-    return /*#__PURE__*/React.createElement("tr", _extends({}, props, {
-      "data-testid": "tableRow"
-    }));
-  });
-  var bodyRef = useRef(null);
-  var SortableBody = SortableContainer(function (props) {
-    return /*#__PURE__*/React.createElement("tbody", _extends({}, props, {
-      ref: bodyRef
-    }));
-  });
-  var onSortEnd = function onSortEnd(sortEnd) {
-    var oldIndex = sortEnd.oldIndex,
-      newIndex = sortEnd.newIndex;
-    if (oldIndex !== newIndex) {
-      var newData = _toConsumableArray(dataSource); // 创建 dataSource 的副本
-      // 移除旧位置的元素，并将其插入新位置
-      var _newData$splice = newData.splice(oldIndex, 1),
-        _newData$splice2 = _slicedToArray(_newData$splice, 1),
-        removedItem = _newData$splice2[0];
-      newData.splice(newIndex, 0, removedItem);
-      var filteredData = newData.filter(function (el) {
-        return !!el;
-      }); // 过滤掉空元素
-      onEnd === null || onEnd === void 0 ? void 0 : onEnd(filteredData);
-    }
-  };
-  var DraggableContainer = function DraggableContainer(props) {
-    return /*#__PURE__*/React.createElement(SortableBody, _extends({}, props, {
-      useDragHandle: true,
-      disableAutoscroll: true,
-      helperClass: "row-dragging",
-      helperContainer: function helperContainer() {
-        return bodyRef.current;
-      },
-      onSortEnd: onSortEnd
-    }));
-  };
-  var DraggableBodyRow = function DraggableBodyRow(props) {
-    // function findIndex base on Table rowKey props and should always be a right array index
-    var index = dataSource.findIndex(function (x) {
-      return typeof rowKey === 'string' && x[rowKey] === props['data-row-key'];
-    });
-    return /*#__PURE__*/React.createElement(SortableItem, _extends({}, props, {
-      key: index,
-      index: index
-    }));
-  };
-  return /*#__PURE__*/React.createElement(ConfigProviderWrapper, null, /*#__PURE__*/React.createElement(Table, _extends({}, props, {
-    columns: newColumns,
-    dataSource: dataSource,
-    rowKey: rowKey,
+  return /*#__PURE__*/React.createElement(DndContext, {
+    modifiers: [restrictToVerticalAxis],
+    onDragEnd: onDragEnd
+  }, /*#__PURE__*/React.createElement(SortableContext, {
+    items: dataSource.map(function (record) {
+      return getKey(record);
+    }),
+    strategy: verticalListSortingStrategy
+  }, /*#__PURE__*/React.createElement(Table, _extends({}, props, {
     components: {
       body: {
-        wrapper: DraggableContainer,
-        row: DraggableBodyRow
+        row: Row
       }
-    }
-  })));
+    },
+    columns: columns
+  }))));
 };
 export default SortTable;

package/dist/virtual-table/index.d.ts

@@ -1,4 +1,4 @@
 import type { TableProps } from 'antd';
 import React from 'react';
-declare const VirtualTable: <RecordType extends Record<string, unknown>>(props: TableProps<RecordType>) => React.JSX.Element;
+declare const VirtualTable: <RecordType extends Record<string | number | symbol, any>>(props: TableProps<RecordType>) => React.JSX.Element;
 export default VirtualTable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x-star-design",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "description": "A react component library developed by turingstar",
   "license": "MIT",
   "module": "dist/index.js",
@@ -52,6 +52,10 @@
     "@codemirror/lang-python": "^6.1.3",
     "@codemirror/language": "^6.9.0",
     "@codemirror/lint": "^6.4.0",
+    "@dnd-kit/core": "^6.1.0",
+    "@dnd-kit/modifiers": "^7.0.0",
+    "@dnd-kit/sortable": "^8.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@uiw/codemirror-theme-bbedit": "^4.21.9",
     "@uiw/codemirror-theme-eclipse": "^4.21.9",
     "@uiw/codemirror-theme-okaidia": "^4.21.9",
@@ -62,9 +66,8 @@
     "qiankun": "^2.10.16",
     "randomcolor": "^0.6.2",
     "react-error-boundary": "^4.0.13",
-    "react-sortable-hoc": "^2.0.0",
     "react-window": "^1.8.9",
-    "x-star-utils": "^0.0.18"
+    "x-star-utils": "^0.0.21"
   },
   "devDependencies": {
     "@ant-design/icons": "^5.3.7",