From 0cba5987ff1c9f6c2884f94bf06dfbeaeb27b276 Mon Sep 17 00:00:00 2001 From: Sebastian Bean Date: Sat, 11 Jan 2025 23:36:27 -0800 Subject: [PATCH 1/7] minor changes --- package.json | 10 +++++----- src/components/timeline.less | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 165780e..2bd57f5 100644 --- a/package.json +++ b/package.json @@ -38,10 +38,10 @@ }, "dependencies": { "@interactjs/types": "^1.10.11", - "@types/react-virtualized": "^9.21.14", + "@types/react-virtualized": "^9.22.0", "framework-utils": "^1.1.0", "interactjs": "^1.10.11", - "react-virtualized": "^9.22.3" + "react-virtualized": "^9.22.4" }, "devDependencies": { "@types/howler": "^2.2.4", @@ -58,8 +58,8 @@ "lodash": "^4.17.21", "lottie-web": "^5.8.1", "prettier": "^2.2.1", - "react": "^17.0.0", - "react-dom": "^17.0.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "yorkie": "^2.0.0" } -} +} \ No newline at end of file diff --git a/src/components/timeline.less b/src/components/timeline.less index 81b2458..74376a2 100644 --- a/src/components/timeline.less +++ b/src/components/timeline.less @@ -1,8 +1,6 @@ .timeline-editor { - height: 600px; - width: 600px; - min-height: 32px; + min-height: 300px; position: relative; font-size: 12px; font-family: "PingFang SC"; From f49eb57b06eb82de7b41f2fe01da3ca8fce76934 Mon Sep 17 00:00:00 2001 From: Sebastian Bean Date: Sun, 12 Jan 2025 02:10:02 -0800 Subject: [PATCH 2/7] big up the timeline mon --- src/components/timeline.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/timeline.less b/src/components/timeline.less index 74376a2..7dcd702 100644 --- a/src/components/timeline.less +++ b/src/components/timeline.less @@ -1,6 +1,6 @@ .timeline-editor { - min-height: 300px; + min-height: 80vh; position: relative; font-size: 12px; font-family: "PingFang SC"; From ae0d4b5d99eacb6d1af355e483376ca1e61a41af Mon Sep 17 00:00:00 2001 From: Sebastian Bean Date: Sun, 12 Jan 2025 19:49:11 -0800 Subject: [PATCH 3/7] fix for react 18 --- src/components/row_rnd/interactable.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/row_rnd/interactable.tsx b/src/components/row_rnd/interactable.tsx index 0b334e4..6dc2385 100644 --- a/src/components/row_rnd/interactable.tsx +++ b/src/components/row_rnd/interactable.tsx @@ -2,15 +2,15 @@ import { DraggableOptions } from "@interactjs/actions/drag/plugin"; import { ResizableOptions } from "@interactjs/actions/resize/plugin"; import { DragEvent, Interactable } from "@interactjs/types"; import interact from "interactjs"; -import { cloneElement, FC, ReactElement, useEffect, useRef } from "react"; +import { cloneElement, FC, ReactElement, useEffect, useRef, PropsWithChildren } from "react"; -export const InteractComp: FC<{ +export const InteractComp: FC; draggable: boolean; draggableOptions: DraggableOptions; resizable: boolean; resizableOptions: ResizableOptions; -}> = ({ children, interactRef, draggable, resizable, draggableOptions, resizableOptions }) => { +}>> = ({ children, interactRef, draggable, resizable, draggableOptions, resizableOptions }) => { const nodeRef = useRef(); const interactable = useRef(); const draggableOptionsRef = useRef(); @@ -36,7 +36,7 @@ export const InteractComp: FC<{ onmove: (e) => draggableOptionsRef.current.onmove && (draggableOptionsRef.current.onmove as (e: DragEvent) => any)(e), onend: (e) => draggableOptionsRef.current.onend && (draggableOptionsRef.current.onend as (e: DragEvent) => any)(e), }); - if (resizable) interactable.current.resizable({ + if (resizable) interactable.current.resizable({ ...resizableOptionsRef.current, onstart: (e) => resizableOptionsRef.current.onstart && (resizableOptionsRef.current.onstart as (e: DragEvent) => any)(e), onmove: (e) => resizableOptionsRef.current.onmove && (resizableOptionsRef.current.onmove as (e: DragEvent) => any)(e), From aa3fefd180ec6eb3034e1edc319526398b42940c Mon Sep 17 00:00:00 2001 From: Sebastian Bean Date: Mon, 13 Jan 2025 18:25:51 -0800 Subject: [PATCH 4/7] bump antd --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2bd57f5..af7bb50 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@types/react": "^17.0.17", "@types/react-dom": "^17.0.17", "@umijs/test": "^3.0.5", - "antd": "^4.16.13", + "antd": "^5.23.1", "dumi": "^1.0.17", "father-build": "^1.17.2", "gh-pages": "^3.0.0", From dedf4561c6169274d4d320962b4982a17378c7a3 Mon Sep 17 00:00:00 2001 From: Sebastian Bean Date: Mon, 13 Jan 2025 21:16:02 -0800 Subject: [PATCH 5/7] rename package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index af7bb50..159703d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@repath-project/react-timeline-editor", + "name": "react-timeline-editor", "version": "0.1.10", "author": "xzdarcy", "license": "MIT", From 8200c4135f5fc574d3c1529c28ba6523b9237446 Mon Sep 17 00:00:00 2001 From: Sebastian Bean Date: Wed, 22 Jan 2025 12:58:58 -0800 Subject: [PATCH 6/7] add postinstall build --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 159703d..f9095e3 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "docs:deploy": "", "build": "father-build", "deploy": "npm run docs:build && npm run docs:deploy", - "prepublishOnly": "npm run build" + "prepublishOnly": "npm run build", + "postinstall": "npm run build" }, "files": [ "dist" From 66758a8f284f6958c15949a9a685567d6cf0d6f7 Mon Sep 17 00:00:00 2001 From: Sebastian Bean Date: Sat, 25 Jan 2025 00:29:37 -0800 Subject: [PATCH 7/7] no tsconfig for simplifying 'monorepo' --- package.json | 12 +++++------- tsconfig.json => tsconfig.json.bak | 0 2 files changed, 5 insertions(+), 7 deletions(-) rename tsconfig.json => tsconfig.json.bak (100%) diff --git a/package.json b/package.json index f9095e3..e10dbea 100644 --- a/package.json +++ b/package.json @@ -24,15 +24,13 @@ "docs:deploy": "", "build": "father-build", "deploy": "npm run docs:build && npm run docs:deploy", - "prepublishOnly": "npm run build", - "postinstall": "npm run build" + "prepublishOnly": "npm run build" }, "files": [ - "dist" + "src" ], - "main": "dist/index.js", - "module": "dist/index.esm.js", - "typings": "dist/index.d.ts", + "main": "src/index.tsx", + "types": "src/index.tsx", "peerDependencies": { "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0" @@ -42,7 +40,7 @@ "@types/react-virtualized": "^9.22.0", "framework-utils": "^1.1.0", "interactjs": "^1.10.11", - "react-virtualized": "^9.22.4" + "react-virtualized": "workspace:*" }, "devDependencies": { "@types/howler": "^2.2.4", diff --git a/tsconfig.json b/tsconfig.json.bak similarity index 100% rename from tsconfig.json rename to tsconfig.json.bak