diff --git a/common/shared/package.json b/common/shared/package.json index a0b778503f..a7918d6c4f 100644 --- a/common/shared/package.json +++ b/common/shared/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "@types/fs-extra": "^11.0.4", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "@univerjs/icons-svg": "^0.2.30", "@univerjs/protocol": "0.1.45" } diff --git a/examples/package.json b/examples/package.json index a94675423c..4d9d89675f 100644 --- a/examples/package.json +++ b/examples/package.json @@ -35,7 +35,7 @@ "@univerjs/engine-formula": "workspace:*", "@univerjs/engine-render": "workspace:*", "@univerjs/find-replace": "workspace:*", - "@univerjs/icons": "0.2.20", + "@univerjs/icons": "0.2.31", "@univerjs/mockdata": "workspace:*", "@univerjs/network": "workspace:*", "@univerjs/rpc": "workspace:*", diff --git a/packages-experimental/action-recorder/package.json b/packages-experimental/action-recorder/package.json index 059a27eaf1..b599798f64 100644 --- a/packages-experimental/action-recorder/package.json +++ b/packages-experimental/action-recorder/package.json @@ -68,7 +68,7 @@ "dependencies": { "@univerjs/core": "workspace:*", "@univerjs/design": "workspace:*", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "@univerjs/sheets": "workspace:*", "@univerjs/sheets-filter": "workspace:*", "@univerjs/sheets-ui": "workspace:*", diff --git a/packages-experimental/debugger/package.json b/packages-experimental/debugger/package.json index d372489dd5..d06a1ac08e 100644 --- a/packages-experimental/debugger/package.json +++ b/packages-experimental/debugger/package.json @@ -68,7 +68,7 @@ "@univerjs/docs-drawing-ui": "workspace:*", "@univerjs/docs-ui": "workspace:*", "@univerjs/engine-render": "workspace:*", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "@univerjs/mockdata": "workspace:*", "@univerjs/sheets": "workspace:*", "@univerjs/sheets-drawing-ui": "workspace:*", diff --git a/packages-experimental/uni-formula-ui/package.json b/packages-experimental/uni-formula-ui/package.json index b7eb9f7669..16a8fee4e8 100644 --- a/packages-experimental/uni-formula-ui/package.json +++ b/packages-experimental/uni-formula-ui/package.json @@ -71,7 +71,7 @@ "@univerjs/docs": "workspace:*", "@univerjs/docs-ui": "workspace:*", "@univerjs/engine-render": "workspace:*", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "@univerjs/rpc": "workspace:*", "@univerjs/sheets-formula": "workspace:*", "@univerjs/sheets-formula-ui": "workspace:*", diff --git a/packages-experimental/uni-sheets-ui/package.json b/packages-experimental/uni-sheets-ui/package.json index ce103fca2c..1e90e4d29d 100644 --- a/packages-experimental/uni-sheets-ui/package.json +++ b/packages-experimental/uni-sheets-ui/package.json @@ -64,7 +64,7 @@ "@univerjs/design": "workspace:*", "@univerjs/docs": "workspace:*", "@univerjs/docs-ui": "workspace:*", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "@univerjs/sheets": "workspace:*", "@univerjs/sheets-drawing-ui": "workspace:*", "@univerjs/sheets-ui": "workspace:*", diff --git a/packages-experimental/uni-slides-ui/package.json b/packages-experimental/uni-slides-ui/package.json index a719dd1630..9b89a55b56 100644 --- a/packages-experimental/uni-slides-ui/package.json +++ b/packages-experimental/uni-slides-ui/package.json @@ -62,7 +62,7 @@ "@univerjs/core": "workspace:*", "@univerjs/design": "workspace:*", "@univerjs/engine-render": "workspace:*", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "@univerjs/slides-ui": "workspace:*", "@univerjs/ui": "workspace:*", "@univerjs/uniui": "workspace:*" diff --git a/packages-experimental/uniui/package.json b/packages-experimental/uniui/package.json index d545ed11c2..216e9f87dd 100644 --- a/packages-experimental/uniui/package.json +++ b/packages-experimental/uniui/package.json @@ -65,7 +65,7 @@ "@univerjs/core": "workspace:*", "@univerjs/design": "workspace:*", "@univerjs/engine-render": "workspace:*", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "@univerjs/sheets": "workspace:*", "@univerjs/sheets-ui": "workspace:*", "@univerjs/ui": "workspace:*", diff --git a/packages/design/package.json b/packages/design/package.json index e5192af84c..788daba71b 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -73,7 +73,7 @@ "@radix-ui/react-separator": "^1.1.2", "@radix-ui/react-tooltip": "^1.1.8", "@rc-component/trigger": "^2.2.6", - "@univerjs/icons": "^0.2.30", + "@univerjs/icons": "^0.2.31", "clsx": "^2.1.1", "dayjs": "^1.11.13", "rc-dialog": "^9.6.0", diff --git a/packages/design/src/components/side-menu/index.tsx b/packages/design/src/components/side-menu/index.tsx index 61b5181f0a..9fb93bffc3 100644 --- a/packages/design/src/components/side-menu/index.tsx +++ b/packages/design/src/components/side-menu/index.tsx @@ -14,6 +14,7 @@ * limitations under the License. */ +import { CatalogueSingle, LeftSingle } from '@univerjs/icons'; import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react'; import { clsx } from '../../helper/clsx'; @@ -76,11 +77,12 @@ export const SideMenu = forwardRef((props, re className={clsx(` univer-absolute univer-left-5 univer-top-4 univer-z-[100] univer-flex univer-h-8 univer-w-8 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-bg-white + univer-text-blue-500 univer-shadow-[0px_1px_3px_-1px_rgba(30,40,77,0.10),0px_1px_4px_0px_rgba(30,40,77,0.12)] `, iconClass)} style={iconStyle} > - {open ? 'x' : 'o'} + {open ? : }
{ prev.endY - prev.startY === curr.endY - curr.startY ) ), [layer.position$]); - + const univerInstanceService = useDependency(IUniverInstanceService); const position = useObservable(useMemo(() => layer.position$.pipe(first()), [layer.position$])); const domRef = useRef(null); const innerDomRef = useRef(null); @@ -94,7 +94,21 @@ const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => { }; }, [layer.position$, size$]); - const component = useMemo(() => Component ? : null, [Component, layerProps]); + const instance = univerInstanceService.getUnit(layer.unitId); + const docDisabled = instance instanceof DocumentDataModel ? instance.getDisabled() : undefined; + const component = useMemo(() => Component + ? ( + + ) + : null, [Component, layerProps]); if (!position) { return null; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe95661b33..5d056b5181 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -181,8 +181,8 @@ importers: specifier: ^11.0.4 version: 11.0.4 '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/icons-svg': specifier: ^0.2.30 version: 0.2.30 @@ -335,8 +335,8 @@ importers: specifier: workspace:* version: link:../packages/find-replace '@univerjs/icons': - specifier: 0.2.20 - version: 0.2.20(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: 0.2.31 + version: 0.2.31(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/mockdata': specifier: workspace:* version: link:../mockdata @@ -595,8 +595,8 @@ importers: specifier: workspace:* version: link:../../packages/design '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../../packages/sheets @@ -653,8 +653,8 @@ importers: specifier: workspace:* version: link:../../packages/engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/mockdata': specifier: workspace:* version: link:../../mockdata @@ -808,8 +808,8 @@ importers: specifier: workspace:* version: link:../../packages/engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/rpc': specifier: workspace:* version: link:../../packages/rpc @@ -869,8 +869,8 @@ importers: specifier: workspace:* version: link:../../packages/docs-ui '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../../packages/sheets @@ -924,8 +924,8 @@ importers: specifier: workspace:* version: link:../../packages/engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/slides-ui': specifier: workspace:* version: link:../../packages/slides-ui @@ -979,8 +979,8 @@ importers: specifier: workspace:* version: link:../../packages/engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../../packages/sheets @@ -1132,8 +1132,8 @@ importers: specifier: ^2.2.6 version: 2.2.6(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -1291,8 +1291,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/ui': specifier: workspace:* version: link:../ui @@ -1365,8 +1365,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/ui': specifier: workspace:* version: link:../ui @@ -1466,8 +1466,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/ui': specifier: workspace:* version: link:../ui @@ -1512,8 +1512,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/thread-comment': specifier: workspace:* version: link:../thread-comment @@ -1567,8 +1567,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/ui': specifier: workspace:* version: link:../ui @@ -1647,8 +1647,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/ui': specifier: workspace:* version: link:../ui @@ -1785,8 +1785,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/ui': specifier: workspace:* version: link:../ui @@ -1974,8 +1974,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2044,8 +2044,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2145,8 +2145,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2243,8 +2243,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2329,8 +2329,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/rpc': specifier: workspace:* version: link:../rpc @@ -2467,8 +2467,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2587,8 +2587,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2682,8 +2682,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2762,8 +2762,8 @@ importers: specifier: workspace:* version: link:../engine-formula '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2848,8 +2848,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -2918,8 +2918,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/protocol': specifier: 0.1.45 version: 0.1.45(@grpc/grpc-js@1.10.9)(rxjs@7.8.1) @@ -2979,8 +2979,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/sheets': specifier: workspace:* version: link:../sheets @@ -3062,8 +3062,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/slides': specifier: workspace:* version: link:../slides @@ -3155,8 +3155,8 @@ importers: specifier: workspace:* version: link:../docs-ui '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@univerjs/thread-comment': specifier: workspace:* version: link:../thread-comment @@ -3204,8 +3204,8 @@ importers: specifier: workspace:* version: link:../engine-render '@univerjs/icons': - specifier: ^0.2.30 - version: 0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + specifier: ^0.2.31 + version: 0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@wendellhu/redi': specifier: 0.17.1 version: 0.17.1 @@ -4478,7 +4478,7 @@ packages: resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==} '@protobufjs/path@1.1.2': - resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==} + resolution: {integrity: sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=} '@protobufjs/pool@1.1.0': resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==} @@ -5499,14 +5499,14 @@ packages: '@univerjs/icons-svg@0.2.30': resolution: {integrity: sha512-K4oYtk0XM3CPprgK+vU/yMIT0VYAZ0akiTnzllGuQ4bGPYPTVDL+4yWBtbUMp3K3ZtRhWhPpaEJphiB42u2qhw==} - '@univerjs/icons@0.2.20': - resolution: {integrity: sha512-KwQXI+6e+Qbuqv7+xYSVmK448L/Vj519f4xd5lPI8v6T+BsiB2gixPi3CQYKh6dQY3s5jdBpkTyYaAJfG3qgog==} + '@univerjs/icons@0.2.31': + resolution: {integrity: sha512-TG9JHbklC3ZeqEvBtM0Q1odNldIOEThBde1AVA54EaxqEoiavZHqnq8ZIxVlkf/8G8tLqfl1QFvDYUYTmvvzVA==} peerDependencies: react: '19' react-dom: '19' - '@univerjs/icons@0.2.30': - resolution: {integrity: sha512-odT3d9iKSNXaKWisPiaUVTSKibeWiSWvsspBxDisaA+s0KYn5rAlhBJjOVbSWZ83dE8tvxhhznGPjSyYANXVrw==} + '@univerjs/icons@0.2.32': + resolution: {integrity: sha512-Vorm9CfnnwqengJneIPv8EDwXs+WxwQai61ys9JxXIGIP02dvdiDfQ/su3isYm7KveNi0SY0bUH35TPlszRBWA==} peerDependencies: react: '19' react-dom: '19' @@ -13560,12 +13560,12 @@ snapshots: '@univerjs/icons-svg@0.2.30': {} - '@univerjs/icons@0.2.20(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + '@univerjs/icons@0.2.31(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) - '@univerjs/icons@0.2.30(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + '@univerjs/icons@0.2.32(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: react: 19.0.0 react-dom: 19.0.0(react@19.0.0)