From d9c635b6df4ced5102cde0069c3859acd490adf3 Mon Sep 17 00:00:00 2001 From: ameer2468 <33054370+ameer2468@users.noreply.github.com> Date: Tue, 7 Oct 2025 14:42:03 +0300 Subject: [PATCH] remove solid motion one --- apps/desktop/package.json | 1 - .../new-main/TargetMenuGrid.tsx | 80 +++++--- .../routes/(window-chrome)/new-main/index.tsx | 194 +++++++++--------- pnpm-lock.yaml | 88 +------- 4 files changed, 154 insertions(+), 209 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 23aee2c67a..4f11767ca4 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -59,7 +59,6 @@ "posthog-js": "^1.215.3", "solid-js": "^1.9.3", "solid-markdown": "^2.0.13", - "solid-motionone": "^1.0.4", "solid-presence": "^0.1.8", "solid-toast": "^0.5.0", "solid-transition-group": "^0.2.3", diff --git a/apps/desktop/src/routes/(window-chrome)/new-main/TargetMenuGrid.tsx b/apps/desktop/src/routes/(window-chrome)/new-main/TargetMenuGrid.tsx index 34cd229125..abb75d55f2 100644 --- a/apps/desktop/src/routes/(window-chrome)/new-main/TargetMenuGrid.tsx +++ b/apps/desktop/src/routes/(window-chrome)/new-main/TargetMenuGrid.tsx @@ -1,6 +1,6 @@ import { cx } from "cva"; import { createMemo, For, Match, Switch } from "solid-js"; -import { Motion } from "solid-motionone"; +import { Transition } from "solid-transition-group"; import type { CaptureDisplayWithThumbnail, CaptureWindowWithThumbnail, @@ -134,23 +134,30 @@ export default function TargetMenuGrid(props: TargetMenuGridProps) { return ( {(item, index) => ( - - displayProps.onSelect?.(item)} - disabled={displayProps.disabled} - onKeyDown={handleKeyDown} - class="w-full" - data-target-menu-card="true" - highlightQuery={displayProps.highlightQuery} - /> - +
+ displayProps.onSelect?.(item)} + disabled={displayProps.disabled} + onKeyDown={handleKeyDown} + class="w-full" + data-target-menu-card="true" + highlightQuery={displayProps.highlightQuery} + /> +
+ )} ); @@ -162,23 +169,30 @@ export default function TargetMenuGrid(props: TargetMenuGridProps) { return ( {(item, index) => ( - - windowProps.onSelect?.(item)} - disabled={windowProps.disabled} - onKeyDown={handleKeyDown} - class="w-full" - data-target-menu-card="true" - highlightQuery={windowProps.highlightQuery} - /> - +
+ windowProps.onSelect?.(item)} + disabled={windowProps.disabled} + onKeyDown={handleKeyDown} + class="w-full" + data-target-menu-card="true" + highlightQuery={windowProps.highlightQuery} + /> +
+ )} ); diff --git a/apps/desktop/src/routes/(window-chrome)/new-main/index.tsx b/apps/desktop/src/routes/(window-chrome)/new-main/index.tsx index 603b45542d..aeed303171 100644 --- a/apps/desktop/src/routes/(window-chrome)/new-main/index.tsx +++ b/apps/desktop/src/routes/(window-chrome)/new-main/index.tsx @@ -27,7 +27,7 @@ import { Suspense, } from "solid-js"; import { reconcile } from "solid-js/store"; -import { Motion, Presence } from "solid-motionone"; +// Removed solid-motionone in favor of solid-transition-group import { Transition } from "solid-transition-group"; import Tooltip from "~/components/Tooltip"; import { Input } from "~/routes/editor/ui"; @@ -622,111 +622,115 @@ function Page() { ); const TargetSelectionHome = () => ( - -
-
- { - if (isRecording()) return; - setOptions("targetMode", (v) => - v === "display" ? null : "display", - ); - }} - name="Display" - class="flex-1 rounded-none focus-visible:ring-0 focus-visible:ring-offset-0" - /> - +
+
(displayTriggerRef = el)} - disabled={isRecording()} - expanded={displayMenuOpen()} - onClick={() => { - setDisplayMenuOpen((prev) => { - const next = !prev; - if (next) { - setWindowMenuOpen(false); - setHasOpenedDisplayMenu(true); - } - return next; - }); - }} - aria-haspopup="menu" - aria-label="Choose display" - /> -
-
- { - if (isRecording()) return; - setOptions("targetMode", (v) => - v === "window" ? null : "window", - ); - }} - name="Window" - class="flex-1 rounded-none focus-visible:ring-0 focus-visible:ring-offset-0" - /> - + { + if (isRecording()) return; + setOptions("targetMode", (v) => + v === "display" ? null : "display", + ); + }} + name="Display" + class="flex-1 rounded-none focus-visible:ring-0 focus-visible:ring-offset-0" + /> + (displayTriggerRef = el)} + disabled={isRecording()} + expanded={displayMenuOpen()} + onClick={() => { + setDisplayMenuOpen((prev) => { + const next = !prev; + if (next) { + setWindowMenuOpen(false); + setHasOpenedDisplayMenu(true); + } + return next; + }); + }} + aria-haspopup="menu" + aria-label="Choose display" + /> +
+
(windowTriggerRef = el)} + > + { + if (isRecording()) return; + setOptions("targetMode", (v) => + v === "window" ? null : "window", + ); + }} + name="Window" + class="flex-1 rounded-none focus-visible:ring-0 focus-visible:ring-offset-0" + /> + (windowTriggerRef = el)} + disabled={isRecording()} + expanded={windowMenuOpen()} + onClick={() => { + setWindowMenuOpen((prev) => { + const next = !prev; + if (next) { + setDisplayMenuOpen(false); + setHasOpenedWindowMenu(true); + } + return next; + }); + }} + aria-haspopup="menu" + aria-label="Choose window" + /> +
+ { - setWindowMenuOpen((prev) => { - const next = !prev; - if (next) { - setDisplayMenuOpen(false); - setHasOpenedWindowMenu(true); - } - return next; - }); + if (isRecording()) return; + setOptions("targetMode", (v) => (v === "area" ? null : "area")); }} - aria-haspopup="menu" - aria-label="Choose window" + name="Area" />
- { - if (isRecording()) return; - setOptions("targetMode", (v) => (v === "area" ? null : "area")); - }} - name="Area" - /> +
- - + ); const startSignInCleanup = listen("start-sign-in", async () => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 942d6ee14f..7735b47070 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -182,9 +182,6 @@ importers: solid-markdown: specifier: ^2.0.13 version: 2.0.14(solid-js@1.9.6) - solid-motionone: - specifier: ^1.0.4 - version: 1.0.4(solid-js@1.9.6) solid-presence: specifier: ^0.1.8 version: 0.1.8(solid-js@1.9.6) @@ -3751,24 +3748,6 @@ packages: resolution: {integrity: sha512-oxzMzYCkZHMntzuyerehK3fV6A2Kwh5BD6CGEJSVDU2QNEhfLOptf2X7esQgaHZXHZY0oHmMsOtIDLP71UJXgA==} engines: {node: '>=18'} - '@motionone/animation@10.18.0': - resolution: {integrity: sha512-9z2p5GFGCm0gBsZbi8rVMOAJCtw1WqBTIPw3ozk06gDvZInBPIsQcHgYogEJ4yuHJ+akuW8g1SEIOpTOvYs8hw==} - - '@motionone/dom@10.18.0': - resolution: {integrity: sha512-bKLP7E0eyO4B2UaHBBN55tnppwRnaE3KFfh3Ps9HhnAkar3Cb69kUCJY9as8LrccVYKgHA+JY5dOQqJLOPhF5A==} - - '@motionone/easing@10.18.0': - resolution: {integrity: sha512-VcjByo7XpdLS4o9T8t99JtgxkdMcNWD3yHU/n6CLEz3bkmKDRZyYQ/wmSf6daum8ZXqfUAgFeCZSpJZIMxaCzg==} - - '@motionone/generators@10.18.0': - resolution: {integrity: sha512-+qfkC2DtkDj4tHPu+AFKVfR/C30O1vYdvsGYaR13W/1cczPrrcjdvYCj0VLFuRMN+lP1xvpNZHCRNM4fBzn1jg==} - - '@motionone/types@10.17.1': - resolution: {integrity: sha512-KaC4kgiODDz8hswCrS0btrVrzyU2CSQKO7Ps90ibBVSQmjkrt2teqta6/sOG59v7+dPnKMAg13jyqtMKV2yJ7A==} - - '@motionone/utils@10.18.0': - resolution: {integrity: sha512-3XVF7sgyTSI2KWvTf6uLlBJ5iAgRgmvp3bpuOiQJvInd4nZ19ET8lX5unn30SlmRH7hXbBbH+Gxd0m0klJ3Xtw==} - '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': resolution: {integrity: sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==} cpu: [arm64] @@ -9635,9 +9614,6 @@ packages: resolution: {integrity: sha512-ZRiwvN089JfMXokizgqEPXsl2Guk094yExfoDXR0cBYWxtBbaSww/w+vT4WEJsBW2iTUi1GgZ6swmoug3Oy4Xw==} engines: {node: '>=16.0.0'} - hey-listen@1.0.8: - resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} - hls.js@0.14.17: resolution: {integrity: sha512-25A7+m6qqp6UVkuzUQ//VVh2EEOPYlOBg32ypr34bcPO7liBMOkKFvbjbCBfiPAOTA/7BSx1Dujft3Th57WyFg==} @@ -12580,11 +12556,6 @@ packages: peerDependencies: solid-js: ^1.6.0 - solid-motionone@1.0.4: - resolution: {integrity: sha512-aqEjgecoO9raDFznu/dEci7ORSmA26Kjj9J4Cn1Gyr0GZuOVdvsNxdxClTL9J40Aq/uYFx4GLwC8n70fMLHiuA==} - peerDependencies: - solid-js: ^1.8.0 - solid-presence@0.1.8: resolution: {integrity: sha512-pWGtXUFWYYUZNbg5YpG5vkQJyOtzn2KXhxYaMx/4I+lylTLYkITOLevaCwMRN+liCVk0pqB6EayLWojNqBFECA==} peerDependencies: @@ -16929,41 +16900,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@motionone/animation@10.18.0': - dependencies: - '@motionone/easing': 10.18.0 - '@motionone/types': 10.17.1 - '@motionone/utils': 10.18.0 - tslib: 2.8.1 - - '@motionone/dom@10.18.0': - dependencies: - '@motionone/animation': 10.18.0 - '@motionone/generators': 10.18.0 - '@motionone/types': 10.17.1 - '@motionone/utils': 10.18.0 - hey-listen: 1.0.8 - tslib: 2.8.1 - - '@motionone/easing@10.18.0': - dependencies: - '@motionone/utils': 10.18.0 - tslib: 2.8.1 - - '@motionone/generators@10.18.0': - dependencies: - '@motionone/types': 10.17.1 - '@motionone/utils': 10.18.0 - tslib: 2.8.1 - - '@motionone/types@10.17.1': {} - - '@motionone/utils@10.18.0': - dependencies: - '@motionone/types': 10.17.1 - hey-listen: 1.0.8 - tslib: 2.8.1 - '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3': optional: true @@ -22124,6 +22060,10 @@ snapshots: dependencies: ms: 2.1.3 + debug@4.4.0: + dependencies: + ms: 2.1.3 + debug@4.4.0(supports-color@5.5.0): dependencies: ms: 2.1.3 @@ -24118,8 +24058,6 @@ snapshots: helmet@7.2.0: {} - hey-listen@1.0.8: {} - hls.js@0.14.17: dependencies: eventemitter3: 4.0.7 @@ -24988,7 +24926,7 @@ snapshots: whatwg-encoding: 3.1.1 whatwg-mimetype: 4.0.0 whatwg-url: 14.2.0 - ws: 8.18.2 + ws: 8.18.3 xml-name-validator: 5.0.0 transitivePeerDependencies: - bufferutil @@ -27843,16 +27781,6 @@ snapshots: transitivePeerDependencies: - supports-color - solid-motionone@1.0.4(solid-js@1.9.6): - dependencies: - '@motionone/dom': 10.18.0 - '@motionone/utils': 10.18.0 - '@solid-primitives/props': 3.2.1(solid-js@1.9.6) - '@solid-primitives/refs': 1.1.1(solid-js@1.9.6) - '@solid-primitives/transition-group': 1.1.1(solid-js@1.9.6) - csstype: 3.1.3 - solid-js: 1.9.6 - solid-presence@0.1.8(solid-js@1.9.6): dependencies: '@corvu/utils': 0.4.2(solid-js@1.9.6) @@ -28917,7 +28845,7 @@ snapshots: '@antfu/install-pkg': 0.4.1 '@antfu/utils': 0.7.10 '@iconify/utils': 2.3.0 - debug: 4.4.0(supports-color@5.5.0) + debug: 4.4.0 kolorist: 1.8.0 local-pkg: 0.5.1 unplugin: 1.16.1 @@ -29257,7 +29185,7 @@ snapshots: vite-tsconfig-paths@5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.17)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)): dependencies: - debug: 4.4.0(supports-color@5.5.0) + debug: 4.4.0 globrex: 0.1.2 tsconfck: 3.1.5(typescript@5.8.3) optionalDependencies: @@ -29332,7 +29260,7 @@ snapshots: '@vitest/spy': 2.1.9 '@vitest/utils': 2.1.9 chai: 5.2.0 - debug: 4.4.0(supports-color@5.5.0) + debug: 4.4.0 expect-type: 1.2.1 magic-string: 0.30.17 pathe: 1.1.2