Skip to content

Commit

Permalink
chore: upgrade deps
Browse files Browse the repository at this point in the history
  • Loading branch information
hemengke1997 committed Nov 13, 2024
1 parent f04b0f8 commit 12c929a
Show file tree
Hide file tree
Showing 10 changed files with 151 additions and 107 deletions.
210 changes: 125 additions & 85 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"@vscode/vsce": "^3.2.1",
"ahooks": "^3.8.1",
"ahooks-x": "^1.3.4",
"antd": "^5.21.6",
"antd": "^5.22.0",
"bumpp": "^9.8.1",
"consola": "^3.2.3",
"context-state": "^3.1.2",
Expand All @@ -120,7 +120,6 @@
"execa": "8.0.1",
"exif-reader": "^2.0.1",
"flat": "^6.0.1",
"framer-motion": "^11.11.11",
"fs-extra": "^11.2.0",
"fuse.js": "^7.0.0",
"globby": "^14.0.2",
Expand All @@ -136,6 +135,7 @@
"micromatch": "^4.0.8",
"mime": "^4.0.4",
"minimist": "^1.2.8",
"motion": "^11.11.14",
"nanoid": "^5.0.8",
"node-fetch": "^3.3.2",
"npm-run-all2": "^7.0.1",
Expand All @@ -144,11 +144,11 @@
"p-map": "^7.0.2",
"p-timeout": "^6.1.3",
"patch-package": "^8.0.0",
"postcss": "^8.4.48",
"postcss": "^8.4.49",
"prettier-plugin-tailwindcss": "^0.6.8",
"pump": "3.0.0",
"react": "^18.3.1",
"react-atom-toast": "^1.3.0",
"react-atom-toast": "^1.3.2",
"react-contexify": "^6.0.0",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.1.2",
Expand Down
24 changes: 14 additions & 10 deletions patches/rc-collapse+3.8.0.patch → patches/rc-collapse+3.9.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@ index 7877573..14c331c 100644
rawActiveKey = props.activeKey,
defaultActiveKey = props.defaultActiveKey,
diff --git a/node_modules/rc-collapse/es/Panel.js b/node_modules/rc-collapse/es/Panel.js
index 3510471..876cc0c 100644
index 52e72dd..2bb65e2 100644
--- a/node_modules/rc-collapse/es/Panel.js
+++ b/node_modules/rc-collapse/es/Panel.js
@@ -61,7 +61,7 @@ var CollapsePanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
className: headerClassName,
'aria-expanded': isActive,
'aria-disabled': disabled,
- onKeyDown: handleKeyDown,
+ // onKeyDown: handleKeyDown,
style: styles.header
};
if (!collapsibleHeader && !collapsibleIcon) {
@@ -38,9 +38,9 @@ var CollapsePanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
onItemClick === null || onItemClick === void 0 || onItemClick(panelKey);
},
onKeyDown: function onKeyDown(e) {
- if (e.key === 'Enter' || e.keyCode === KeyCode.ENTER || e.which === KeyCode.ENTER) {
- onItemClick === null || onItemClick === void 0 || onItemClick(panelKey);
- }
+ // if (e.key === 'Enter' || e.keyCode === KeyCode.ENTER || e.which === KeyCode.ENTER) {
+ // onItemClick === null || onItemClick === void 0 || onItemClick(panelKey);
+ // }
},
role: accordion ? 'tab' : 'button'
}, 'aria-expanded', isActive), 'aria-disabled', disabled), "tabIndex", disabled ? -1 : 0);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memo, type PropsWithChildren } from 'react'
import { motion } from 'framer-motion'
import { motion } from 'motion/react'
import { ANIMATION_DURATION } from '~/webview/image-manager/utils/duration'

function AppearMotion(props: PropsWithChildren) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { memo, type PropsWithChildren, useEffect } from 'react'
import { TinyColor } from '@ctrl/tinycolor'
import { theme as antdTheme, App, ConfigProvider } from 'antd'
import { MotionConfig } from 'framer-motion'
import { MotionConfig } from 'motion/react'
import SettingsContext from '~/webview/image-manager/contexts/settings-context'
import { getCssVar } from '~/webview/ui-framework/src/utils/theme'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { memo, type ReactNode, useMemo, useRef } from 'react'
import { useTranslation } from 'react-i18next'
import { useMemoizedFn } from 'ahooks'
import { Card, type CollapseProps, ConfigProvider, Empty } from 'antd'
import { motion } from 'framer-motion'
import { isNil } from 'lodash-es'
import { motion } from 'motion/react'
import { FaRegImages } from 'react-icons/fa6'
import { VscFileMedia } from 'react-icons/vsc'
import { classNames } from 'tw-clsx'
Expand Down
4 changes: 2 additions & 2 deletions src/webview/image-manager/components/lazy-image/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { animateScroll } from 'react-scroll'
import { useInViewport, useMemoizedFn, useSetState } from 'ahooks'
import { useControlledState } from 'ahooks-x'
import { Image, type ImageProps } from 'antd'
import { motion } from 'framer-motion'
import { trim } from 'lodash-es'
import { motion } from 'motion/react'
import { FiCheckCircle } from 'react-icons/fi'
import { HiOutlineViewfinderCircle } from 'react-icons/hi2'
import { MdOutlineRemoveCircle } from 'react-icons/md'
Expand Down Expand Up @@ -435,7 +435,7 @@ function LazyImage(props: LazyImageProps) {
[t],
)

// 目前 framer-motion viewport root 有bug,在 root 改变后不会重新observe
// 目前 motion/react viewport root 有bug,在 root 改变后不会重新observe
// 所以这里需要判断 root 是否存在
if (lazy && !lazy.root) {
return null
Expand Down
2 changes: 1 addition & 1 deletion src/webview/image-manager/components/viewer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next'
import styleObjectToString from '@minko-fe/style-object-to-string'
import { useMemoizedFn } from 'ahooks'
import { Card, Empty, Skeleton } from 'antd'
import { AnimatePresence, motion } from 'framer-motion'
import { produce } from 'immer'
import { floor } from 'lodash-es'
import { AnimatePresence, motion } from 'motion/react'
import { IoMdImages } from 'react-icons/io'
import FilterContext from '../../contexts/filter-context'
import GlobalContext from '../../contexts/global-context'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { Trans, useTranslation } from 'react-i18next'
import { useMemoizedFn } from 'ahooks'
import { Alert, Button, Divider, Form, Input, InputNumber, Segmented, Tooltip } from 'antd'
import { flatten as flattenObject, unflatten } from 'flat'
import { motion } from 'framer-motion'
import { intersection, mapValues, merge, omit } from 'lodash-es'
import { motion } from 'motion/react'
import { BsQuestionCircleFill } from 'react-icons/bs'
import { type OperatorResult } from '~/core'
import { type CompressionOptions } from '~/core/operator/compressor/type'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memo, type ReactNode } from 'react'
import { AnimatePresence, motion } from 'framer-motion'
import { AnimatePresence, motion } from 'motion/react'
import { type OperatorResult } from '~/core'
import { ANIMATION_DURATION } from '~/webview/image-manager/utils/duration'

Expand Down

0 comments on commit 12c929a

Please sign in to comment.