mirror of
https://github.com/dream-num/univer.git
synced 2026-09-21 05:44:04 +08:00
fix: fixed tooltip warnings in React 18 (#4794)
This commit is contained in:
@@ -24,12 +24,12 @@
|
||||
"univer-cli": "bin/index.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@typescript-eslint/parser": "^8.24.1",
|
||||
"@typescript-eslint/parser": "^8.26.0",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
"@vitest/coverage-istanbul": "^3.0.7",
|
||||
"@vitest/coverage-istanbul": "^3.0.8",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"eslint-plugin-readable-tailwind": "^1.9.0",
|
||||
"eslint-plugin-readable-tailwind": "^1.9.1",
|
||||
"fs-extra": "^11.3.0",
|
||||
"happy-dom": "15.0.0",
|
||||
"javascript-obfuscator": "^4.1.1",
|
||||
@@ -37,15 +37,15 @@
|
||||
"sort-keys": "^5.1.0",
|
||||
"tailwind-scrollbar": "^3.1.0",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"vite": "^6.2.0",
|
||||
"vite-plugin-dts": "^4.5.0",
|
||||
"vite": "^6.2.1",
|
||||
"vite-plugin-dts": "^4.5.3",
|
||||
"vite-plugin-external": "^6.0.1",
|
||||
"vitest": "^3.0.7"
|
||||
"vitest": "^3.0.8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/fs-extra": "^11.0.4",
|
||||
"@univerjs/icons": "^0.2.20",
|
||||
"@univerjs/icons-svg": "^0.2.20",
|
||||
"@univerjs/protocol": "0.1.43"
|
||||
"@univerjs/icons": "^0.2.21",
|
||||
"@univerjs/icons-svg": "^0.2.21",
|
||||
"@univerjs/protocol": "0.1.44"
|
||||
}
|
||||
}
|
||||
|
||||
+10
-10
@@ -3,7 +3,7 @@
|
||||
"type": "module",
|
||||
"version": "0.6.4",
|
||||
"private": true,
|
||||
"packageManager": "pnpm@10.5.2",
|
||||
"packageManager": "pnpm@10.6.1",
|
||||
"author": "DreamNum Co., Ltd. <developer@univer.ai>",
|
||||
"license": "Apache-2.0",
|
||||
"funding": {
|
||||
@@ -44,21 +44,21 @@
|
||||
"release": "release-it"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "4.5.1",
|
||||
"@commitlint/cli": "^19.7.1",
|
||||
"@commitlint/config-conventional": "^19.7.1",
|
||||
"@eslint-react/eslint-plugin": "^1.30.2",
|
||||
"@playwright/test": "^1.50.1",
|
||||
"@antfu/eslint-config": "4.8.1",
|
||||
"@commitlint/cli": "^19.8.0",
|
||||
"@commitlint/config-conventional": "^19.8.0",
|
||||
"@eslint-react/eslint-plugin": "^1.31.0",
|
||||
"@playwright/test": "^1.51.0",
|
||||
"@release-it-plugins/workspaces": "^4.2.0",
|
||||
"@release-it/conventional-changelog": "^9.0.4",
|
||||
"@storybook/react": "8.6.4",
|
||||
"@types/node": "^22.13.9",
|
||||
"@types/node": "^22.13.10",
|
||||
"@types/react": "^19.0.10",
|
||||
"@types/react-dom": "^19.0.4",
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/design": "workspace:*",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"eslint": "9.21.0",
|
||||
"eslint": "9.22.0",
|
||||
"eslint-plugin-format": "^1.0.1",
|
||||
"eslint-plugin-header": "^3.1.1",
|
||||
"eslint-plugin-jsdoc": "^50.6.3",
|
||||
@@ -69,7 +69,7 @@
|
||||
"eslint-plugin-react-refresh": "^0.4.19",
|
||||
"husky": "^9.1.7",
|
||||
"lint-staged": "^15.4.3",
|
||||
"posthog-node": "^4.10.0",
|
||||
"posthog-node": "^4.10.1",
|
||||
"react": "19.0.0",
|
||||
"react-dom": "19.0.0",
|
||||
"release-it": "^17.11.0",
|
||||
@@ -77,7 +77,7 @@
|
||||
"tsx": "^4.19.3",
|
||||
"turbo": "^2.4.4",
|
||||
"typescript": "^5.8.2",
|
||||
"vitest": "^3.0.7"
|
||||
"vitest": "^3.0.8"
|
||||
},
|
||||
"pnpm": {
|
||||
"onlyBuiltDependencies": [
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,8 +84,8 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7",
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8",
|
||||
"vue": "^3.5.13"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
"fast-diff": "1.3.0",
|
||||
"kdbush": "^4.0.2",
|
||||
"lodash-es": "^4.17.21",
|
||||
"nanoid": "5.1.2",
|
||||
"nanoid": "5.1.3",
|
||||
"numeral": "^2.0.6",
|
||||
"numfmt": "^2.5.2",
|
||||
"ot-json1": "^1.0.2",
|
||||
@@ -87,7 +87,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
"@univerjs/sheets": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
"tailwindcss": "^3.4.17",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,13 @@ export const Playground = {
|
||||
</div>
|
||||
)}
|
||||
>
|
||||
<a className="univer-cursor-pointer univer-border univer-rounded-lg univer-border-gray-200 univer-px-4 univer-py-2 univer-border-solid hover:univer-bg-gray-100 univer-transition-all">
|
||||
<a
|
||||
className={`
|
||||
univer-cursor-pointer univer-rounded-lg univer-border univer-border-solid
|
||||
univer-border-gray-200 univer-px-4 univer-py-2 univer-transition-all
|
||||
hover:univer-bg-gray-100
|
||||
`}
|
||||
>
|
||||
Click me
|
||||
</a>
|
||||
</Dropdown>
|
||||
|
||||
@@ -35,9 +35,11 @@ export const Playground = {
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className="univer-box-border univer-relative univer-w-96 univer-p-4 univer-bg-gray-50 univer-h-48 univer-flex univer-justify-center univer-items-center"
|
||||
className={`
|
||||
univer-relative univer-box-border univer-flex univer-h-48 univer-w-96 univer-items-center
|
||||
univer-justify-center univer-bg-gray-50 univer-p-4
|
||||
`}
|
||||
>
|
||||
|
||||
<div className="univer-absolute univer-top-0">
|
||||
<Tooltip title="hello world" placement="top">
|
||||
<Button>top</Button>
|
||||
@@ -62,7 +64,7 @@ export const Playground = {
|
||||
|
||||
<div>
|
||||
<Tooltip title="Just a tooltip">
|
||||
<a className="px-4 py-2 bg-blue-500 text-white rounded">
|
||||
<a className="rounded bg-blue-500 px-4 py-2 text-white">
|
||||
Hover me
|
||||
</a>
|
||||
</Tooltip>
|
||||
|
||||
@@ -14,76 +14,49 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import type { ComponentProps } from 'react';
|
||||
import type { ComponentPropsWithoutRef, ElementRef } from 'react';
|
||||
import { Arrow, Content, Portal, Provider, Root, Trigger } from '@radix-ui/react-tooltip';
|
||||
import { forwardRef } from 'react';
|
||||
import { clsx } from '../../helper/clsx';
|
||||
|
||||
function TooltipProvider({
|
||||
delayDuration = 0,
|
||||
...props
|
||||
}: ComponentProps<typeof Provider>) {
|
||||
return (
|
||||
<Provider
|
||||
data-slot="tooltip-provider"
|
||||
delayDuration={delayDuration}
|
||||
const TooltipProvider = Provider;
|
||||
|
||||
const TooltipPrimitive = Root;
|
||||
|
||||
const TooltipTrigger = Trigger;
|
||||
|
||||
const TooltipContent = forwardRef<
|
||||
ElementRef<typeof Content>,
|
||||
ComponentPropsWithoutRef<typeof Content>
|
||||
>(({ className, sideOffset = 4, children, ...props }, ref) => (
|
||||
<Portal>
|
||||
<Content
|
||||
ref={ref}
|
||||
sideOffset={sideOffset}
|
||||
className={clsx(
|
||||
`
|
||||
univer-z-[1080] univer-box-border univer-w-fit univer-text-balance univer-rounded-lg
|
||||
univer-bg-gray-700 univer-px-3 univer-py-2.5 univer-text-xs univer-font-medium univer-text-white
|
||||
univer-animate-in univer-fade-in-0 univer-zoom-in-95
|
||||
data-[side=bottom]:univer-slide-in-from-top-2
|
||||
data-[side=left]:univer-slide-in-from-right-2
|
||||
data-[side=right]:univer-slide-in-from-left-2
|
||||
data-[side=top]:univer-slide-in-from-bottom-2
|
||||
data-[state=closed]:univer-animate-out data-[state=closed]:univer-fade-out-0
|
||||
data-[state=closed]:univer-zoom-out-95
|
||||
`,
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function TooltipPrimitive({
|
||||
...props
|
||||
}: ComponentProps<typeof Root>) {
|
||||
return (
|
||||
<TooltipProvider>
|
||||
<Root data-slot="tooltip" {...props} />
|
||||
</TooltipProvider>
|
||||
);
|
||||
}
|
||||
|
||||
function TooltipTrigger({
|
||||
...props
|
||||
}: ComponentProps<typeof Trigger>) {
|
||||
return <Trigger data-slot="tooltip-trigger" {...props} />;
|
||||
}
|
||||
|
||||
function TooltipContent({
|
||||
className,
|
||||
sideOffset = 0,
|
||||
children,
|
||||
...props
|
||||
}: ComponentProps<typeof Content>) {
|
||||
return (
|
||||
<Portal>
|
||||
<Content
|
||||
data-slot="tooltip-content"
|
||||
sideOffset={sideOffset}
|
||||
className={clsx(
|
||||
`
|
||||
univer-z-[1080] univer-box-border univer-w-fit univer-text-balance univer-rounded-lg
|
||||
univer-bg-gray-700 univer-px-3 univer-py-2.5 univer-text-xs univer-font-medium univer-text-white
|
||||
univer-animate-in univer-fade-in-0 univer-zoom-in-95
|
||||
data-[side=bottom]:univer-slide-in-from-top-2
|
||||
data-[side=left]:univer-slide-in-from-right-2
|
||||
data-[side=right]:univer-slide-in-from-left-2
|
||||
data-[side=top]:univer-slide-in-from-bottom-2
|
||||
data-[state=closed]:univer-animate-out data-[state=closed]:univer-fade-out-0
|
||||
data-[state=closed]:univer-zoom-out-95
|
||||
`,
|
||||
className
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
{children}
|
||||
<Arrow
|
||||
className={`
|
||||
univer-z-[1080] univer-size-2.5 univer-translate-y-[calc(-50%_-_2px)] univer-rotate-45
|
||||
univer-rounded-[2px] univer-bg-gray-700 univer-fill-gray-700
|
||||
`}
|
||||
/>
|
||||
</Content>
|
||||
</Portal>
|
||||
);
|
||||
}
|
||||
|
||||
>
|
||||
{children}
|
||||
<Arrow
|
||||
className={`
|
||||
univer-z-[1080] univer-size-2.5 univer-translate-y-[calc(-50%_-_2px)] univer-rotate-45
|
||||
univer-rounded-[2px] univer-bg-gray-700 univer-fill-gray-700
|
||||
`}
|
||||
/>
|
||||
</Content>
|
||||
</Portal>
|
||||
));
|
||||
export { TooltipContent, TooltipPrimitive, TooltipProvider, TooltipTrigger };
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,8 +73,8 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
},
|
||||
"browser": {
|
||||
"fs": false
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
"jsdom": "^24.1.1",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
"@univerjs/icons-svg": "^0.2.20",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -15,9 +15,9 @@
|
||||
*/
|
||||
|
||||
import type { IAccessor, IMutation } from '@univerjs/core';
|
||||
import type { IConditionFormattingRule } from '../../models/type';
|
||||
import { CommandType, Tools } from '@univerjs/core';
|
||||
import { ConditionalFormattingRuleModel } from '../../models/conditional-formatting-rule-model';
|
||||
import type { IConditionFormattingRule } from '../../models/type';
|
||||
|
||||
export interface ISetConditionalRuleMutationParams {
|
||||
unitId: string;
|
||||
@@ -56,8 +56,7 @@ export const setConditionalRuleMutationUndoFactory = (accessor: IAccessor, param
|
||||
cfId,
|
||||
rule: Tools.deepClone(rule),
|
||||
} as ISetConditionalRuleMutationParams,
|
||||
},
|
||||
];
|
||||
}];
|
||||
}
|
||||
return [];
|
||||
};
|
||||
|
||||
@@ -82,13 +82,12 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"less": "^4.2.2",
|
||||
"postcss": "^8.5.3",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ export function CrosshairHighlightMenuItemFactory(accessor: IAccessor): IMenuSel
|
||||
label: {
|
||||
name: CROSSHAIR_HIGHLIGHT_OVERLAY_COMPONENT,
|
||||
hoverable: false,
|
||||
selectable: false,
|
||||
},
|
||||
},
|
||||
],
|
||||
|
||||
@@ -19,8 +19,6 @@ import { useDependency, useObservable } from '@univerjs/ui';
|
||||
import { useCallback } from 'react';
|
||||
import { CROSSHAIR_HIGHLIGHT_COLORS, SheetsCrosshairHighlightService } from '../../services/crosshair.service';
|
||||
|
||||
import styles from './index.module.less';
|
||||
|
||||
export interface ICrosshairOverlayProps {
|
||||
onChange?: (value: string) => void;
|
||||
}
|
||||
@@ -37,13 +35,17 @@ export function CrosshairOverlay(props: ICrosshairOverlayProps) {
|
||||
}, [onChange]);
|
||||
|
||||
return (
|
||||
<div className={styles.crosshairHighlightOverlay}>
|
||||
<div className="univer-grid univer-grid-cols-8 univer-gap-x-2 univer-gap-y-3">
|
||||
{CROSSHAIR_HIGHLIGHT_COLORS.map((color: string) => {
|
||||
return (
|
||||
<div
|
||||
key={color}
|
||||
className={clsx(styles.crosshairHighlightItem, {
|
||||
[styles.crosshairHighlightItemSelected]: color === currentColor,
|
||||
className={clsx(`
|
||||
univer-box-border univer-size-5 univer-cursor-pointer univer-rounded univer-border
|
||||
univer-border-solid univer-border-gray-200 univer-ring-offset-1 univer-transition-shadow
|
||||
hover:univer-ring-[1.5px] hover:univer-ring-primary-600/40
|
||||
`, {
|
||||
'univer-ring-[1.5px] univer-ring-primary-600 hover:univer-ring-primary-600': color === currentColor,
|
||||
})}
|
||||
style={{ backgroundColor: color }}
|
||||
onClick={() => handleColorPicked(color)}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
.crosshair-highlight-overlay {
|
||||
display: grid;
|
||||
row-gap: 12px;
|
||||
column-gap: 8px;
|
||||
grid-template-columns: repeat(8, 20px);
|
||||
}
|
||||
|
||||
.crosshair-highlight-item {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
box-sizing: border-box;
|
||||
border-radius: 4px;
|
||||
border: 0.5px solid rgb(var(--grey-400));
|
||||
|
||||
&-selected {
|
||||
outline: 1.5px solid rgb(var(--primary-color));
|
||||
outline-offset: 1.5px;
|
||||
}
|
||||
}
|
||||
@@ -92,7 +92,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
"less": "^4.2.2",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/sheets": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -341,8 +341,7 @@ export default {
|
||||
links: [{
|
||||
title: '教導',
|
||||
url: 'https://support.microsoft.com/zh-tw/office/norminv-%E5%87%BD%E6%95%B0-87981ab8-2de0-4cb0-b1aa-e21d4cb879b8',
|
||||
},
|
||||
],
|
||||
}],
|
||||
functionParameter: {
|
||||
probability: { name: '機率', detail: '對應到常態分佈的機率。' },
|
||||
mean: { name: '平均值', detail: '分佈的算術平均值。' },
|
||||
|
||||
@@ -887,8 +887,7 @@ export default {
|
||||
links: [{
|
||||
title: '教導',
|
||||
url: 'https://support.microsoft.com/zh-tw/office/yield-%E5%87%BD%E6%95%B0-f5f5ca43-c4bd-434f-8bd2-ed3c9727a4fe',
|
||||
},
|
||||
],
|
||||
}],
|
||||
functionParameter: {
|
||||
settlement: { name: '結算日期', detail: '證券的結算日期。' },
|
||||
maturity: { name: '到期日期', detail: '證券的到期日期。' },
|
||||
|
||||
@@ -738,8 +738,7 @@ export default {
|
||||
links: [{
|
||||
title: '教導',
|
||||
url: 'https://support.microsoft.com/zh-tw/office/radians-%E5%87%BD%E6%95%B0-ac409508-3d48-45f5-ac02-1497c92de5bf',
|
||||
},
|
||||
],
|
||||
}],
|
||||
functionParameter: {
|
||||
angle: { name: '角度', detail: '要轉換的角度 (以度數為單位)。' },
|
||||
},
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
"@univerjs/docs": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -617,8 +617,7 @@ export function formulaDataItemToCellData(formulaDataItem: Nullable<IFormulaData
|
||||
* @param formulaData
|
||||
* @returns
|
||||
*/
|
||||
export function formulaDataToCellData(formulaData: IObjectMatrixPrimitiveType<IFormulaDataItem | null>
|
||||
): IObjectMatrixPrimitiveType<Nullable<ICellData>> {
|
||||
export function formulaDataToCellData(formulaData: IObjectMatrixPrimitiveType<IFormulaDataItem | null>): IObjectMatrixPrimitiveType<Nullable<ICellData>> {
|
||||
const cellData = new ObjectMatrix<Nullable<ICellData>>({});
|
||||
const formulaDataMatrix = new ObjectMatrix(formulaData);
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,11 +129,11 @@ export function SheetBarMenu() {
|
||||
const items: IDropdownProps['items'] = useMemo(() => menu.map((item) => ({
|
||||
type: 'item',
|
||||
children: (
|
||||
<div className="univer-pl-6 univer-box-border univer-relative">
|
||||
<div className="univer-relative univer-box-border univer-pl-6">
|
||||
{(item.selected || item.hidden) && (
|
||||
<span className="univer-absolute univer-left-1 univer-top-0.5">
|
||||
{item.selected && <CheckMarkSingle className="univer-text-primary-600 univer-size-4" />}
|
||||
{item.hidden && <EyelashSingle className="univer-text-gray-400 univer-size-4" />}
|
||||
{item.selected && <CheckMarkSingle className="univer-size-4 univer-text-primary-600" />}
|
||||
{item.hidden && <EyelashSingle className="univer-size-4 univer-text-gray-400" />}
|
||||
</span>
|
||||
)}
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,8 +97,8 @@
|
||||
"tailwindcss": "^3.4.17",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7",
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8",
|
||||
"vue": "^3.5.13"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
"rxjs": "^7.8.1",
|
||||
"tailwindcss": "^3.4.17",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"rxjs": "^7.8.1",
|
||||
"typescript": "^5.8.2",
|
||||
"vite": "^6.2.0",
|
||||
"vitest": "^3.0.7"
|
||||
"vite": "^6.2.1",
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
Generated
+1037
-1066
File diff suppressed because it is too large
Load Diff
@@ -26,6 +26,6 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"typescript": "^5.8.2",
|
||||
"vitest": "^3.0.7"
|
||||
"vitest": "^3.0.8"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user