@talex-touch/utils 1.0.17 → 1.0.18

package/animation/window.ts

@@ -0,0 +1,191 @@
+import gsap from 'gsap'
+import { TalexTouch } from '../types'
+
+/**
+ * Window animation controller return type
+ */
+export interface WindowAnimationController {
+  /**
+   * Update window height with animation
+   * @param newHeight - The new height to animate to
+   * @param duration - Animation duration in seconds (default: 0.5)
+   * @returns Promise that resolves to true if animation completed successfully, false if interrupted
+   */
+  updateHeight: (newHeight: number, duration?: number) => Promise<boolean>
+
+  /**
+   * Cancel current animation
+   * @returns Promise that resolves to true if there was an animation to cancel, false otherwise
+   */
+  cancel: () => Promise<boolean>
+
+  /**
+   * Toggle window visibility
+   * @param visible - Optional parameter to explicitly set visibility state
+   * @returns Promise that resolves to true if operation completed successfully, false otherwise
+   */
+  toggleWindow: (visible?: boolean) => Promise<boolean>
+
+  /**
+   * Change current window instance
+   * @param newWindow - New TouchWindow instance
+   */
+  changeWindow: (newWindow: TalexTouch.ITouchWindow) => void
+}
+
+/**
+ * Tracks the state of an animation
+ */
+interface AnimationState {
+  tween: gsap.core.Tween | null
+  completed: boolean
+}
+
+/**
+ * Use GSAP to animate window with cubic-bezier easing
+ * @param window - TouchWindow instance (optional, can be set later with changeWindow)
+ * @returns WindowAnimationController with updateHeight, cancel, toggleWindow, and changeWindow methods
+ */
+export function useWindowAnimation(window?: TalexTouch.ITouchWindow): WindowAnimationController {
+  // Store current window reference inside the function scope
+  let currentWindow: TalexTouch.ITouchWindow | null = window || null
+
+  const animationState: AnimationState = {
+    tween: null,
+    completed: false
+  }
+
+  /**
+   * Check if current window is valid
+   * @returns true if window is valid, false otherwise
+   */
+  const isWindowValid = (): boolean => {
+    return (
+      currentWindow !== null &&
+      currentWindow.window !== null &&
+      !currentWindow.window.isDestroyed()
+    )
+  }
+
+  /**
+   * Get current window with validation
+   * @returns current window or throws error if invalid
+   */
+  const getCurrentWindow = (): TalexTouch.ITouchWindow => {
+    if (!isWindowValid()) {
+      throw new Error('Window is not valid or has been destroyed')
+    }
+    return currentWindow!
+  }
+
+  const updateHeight = async (newHeight: number, duration: number = 0.5): Promise<boolean> => {
+    try {
+      const window = getCurrentWindow()
+
+      // Cancel any existing animation
+      if (animationState.tween) {
+        animationState.tween.kill()
+      }
+
+      // Reset state for new animation
+      animationState.completed = false
+
+      const browserWindow = window.window
+      const [currentWidth, currentHeight] = browserWindow.getSize()
+      const [x, y] = browserWindow.getPosition()
+
+      return new Promise<boolean>((resolve) => {
+        animationState.tween = gsap.to(
+          {
+            height: currentHeight
+          },
+          {
+            height: newHeight,
+            duration,
+            ease: 'cubic-bezier(0.785, 0.135, 0.15, 0.86)',
+            onUpdate: function () {
+              // Check if animation was cancelled or window destroyed
+              if (!animationState.tween || !isWindowValid()) {
+                resolve(false)
+                return
+              }
+
+              const animatedHeight = Math.round(this.targets()[0].height)
+              browserWindow.setSize(currentWidth, animatedHeight)
+              browserWindow.setPosition(x, y)
+            },
+            onComplete: () => {
+              animationState.tween = null
+              animationState.completed = true
+              resolve(true)
+            },
+            onKill: () => {
+              animationState.tween = null
+              resolve(false)
+            }
+          }
+        )
+      })
+    } catch (error) {
+      console.error('Error in updateHeight:', error)
+      return Promise.resolve(false)
+    }
+  }
+
+  const cancel = async (): Promise<boolean> => {
+    if (animationState.tween) {
+      animationState.tween.kill()
+      animationState.tween = null
+      return Promise.resolve(true)
+    }
+    return Promise.resolve(false)
+  }
+
+  const toggleWindow = async (visible?: boolean): Promise<boolean> => {
+    try {
+      const window = getCurrentWindow()
+      const browserWindow = window.window
+
+      // Determine target visibility state
+      const targetVisible = visible !== undefined ? visible : !browserWindow.isVisible()
+
+      if (targetVisible) {
+        // Show window
+        browserWindow.show()
+      } else {
+        // Hide window
+        if (process.platform === 'darwin') {
+          // On macOS, we can simply hide the window
+          browserWindow.hide()
+        } else {
+          // On other platforms, move window far off-screen before hiding
+          browserWindow.setPosition(-100000, -100000)
+          browserWindow.hide()
+        }
+      }
+
+      return Promise.resolve(true)
+    } catch (error) {
+      console.error('Error in toggleWindow:', error)
+      return Promise.resolve(false)
+    }
+  }
+
+  const changeWindow = (newWindow: TalexTouch.ITouchWindow): void => {
+    // Cancel any ongoing animation
+    if (animationState.tween) {
+      animationState.tween.kill()
+      animationState.tween = null
+    }
+
+    // Set new window
+    currentWindow = newWindow
+  }
+
+  return {
+    updateHeight,
+    cancel,
+    toggleWindow,
+    changeWindow
+  }
+}

package/package.json

@@ -5,7 +5,7 @@
   "module": "./index.ts",
   "license": "MPL-2.0",
   "private": false,
-  "version": "1.0.17",
+  "version": "1.0.18",
   "exports": {
     ".": "./index.ts",
     "./types": "./types/index.ts",
@@ -29,7 +29,8 @@
     "./service": "./service/index.ts",
     "./service/protocol": "./service/protocol/index.ts",
     "./electron/env-tool": "./electron/env-tool.ts",
-    "./electron/download-manager": "./electron/download-manager.ts"
+    "./electron/download-manager": "./electron/download-manager.ts",
+    "./animation/": "./animation/"
   },
   "scripts": {
     "publish": "npm publish --access public"

package/electron/window.ts

@@ -1,71 +0,0 @@
-import gsap from 'gsap'
-TalexTouch.
-// 使用类型注释避免直接引用Electron命名空间
-interface ITouchWindow {
-  window: {
-    getSize(): [number, number];
-    getPosition(): [number, number];
-    setSize(width: number, height: number): void;
-    setPosition(x: number, y: number): void;
-  };
-}
-
-// 保存当前动画实例的引用，用于取消上次动画
-let currentTween: gsap.core.Tween | null = null
-
-/**
- * 使用GSAP动画设置窗口高度的函数
- * @param window TouchWindow对象
- * @returns 返回一个可以更新窗口高度的方法
- */
-export function useWindowHeight(window: ITouchWindow): {
-  updateHeight: (newHeight: number, duration?: number) => void
-} {
-  /**
-   * 更新窗口高度的方法
-   * @param newHeight 新的高度值
-   * @param duration 动画持续时间，默认为0.5秒
-   */
-  const updateHeight = (newHeight: number, duration: number = 0.5): void => {
-    // 如果存在上次的动画，先取消它
-    if (currentTween) {
-      currentTween.kill()
-    }
-
-    // 获取当前窗口的BrowserWindow实例
-    const browserWindow = window.window
-
-    // 获取当前窗口的位置和宽度
-    const [currentWidth, currentHeight] = browserWindow.getSize()
-    const [x, y] = browserWindow.getPosition()
-
-    // 使用GSAP创建动画
-    currentTween = gsap.to(
-      {
-        height: currentHeight
-      },
-      {
-        height: newHeight,
-        duration,
-        ease: 'cubic-bezier(0.785, 0.135, 0.15, 0.86)', // 使用指定的贝塞尔曲线
-        onUpdate: function () {
-          // 在动画更新时调整窗口大小
-          const animatedHeight = Math.round(this.targets()[0].height)
-          browserWindow.setSize(currentWidth, animatedHeight)
-          
-          // 保持窗口的顶部位置不变，只改变高度
-          browserWindow.setPosition(x, y)
-        },
-        onComplete: () => {
-          // 动画完成时，清除引用
-          currentTween = null
-        }
-      }
-    )
-  }
-
-  // 返回更新高度的方法
-  return {
-    updateHeight
-  }
-}