From 53288c53556778a7cc99d70ca3601d6795abade0 Mon Sep 17 00:00:00 2001 From: Mirone Date: Sat, 24 Aug 2024 22:55:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?ci:=20=F0=9F=8E=A1=20ignore=20mermaid=20in?= =?UTF-8?q?=20renovate,=20will=20update=20when=20ready?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 0b098c7d38a..a112eea8b0c 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,6 +1,5 @@ { "extends": ["config:base", ":preserveSemverRanges", "group:all"], - "postUpdateOptions": [ - "pnpmDedupe" - ] + "postUpdateOptions": ["pnpmDedupe"], + "ignoreDeps": ["mermaid"] } From 705c26354bf0a24f4a32af17b1658ef46a683288 Mon Sep 17 00:00:00 2001 From: Mirone Date: Sat, 24 Aug 2024 23:53:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=F0=9F=90=9B=20block=20plugin=20disp?= =?UTF-8?q?lay=20and=20exception=20bugs=20(#1485)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 🐛 block plugin display and exception bugs * chore: optimize --- .changeset/green-spies-jam.md | 8 +++ .../components/src/table-block/view/utils.ts | 46 ++++++------ .../src/feature/block-edit/handle/index.ts | 17 ++++- .../crepe/src/theme/common/block-edit.css | 1 + .../src/__internal__/select-node-by-dom.ts | 71 ++++++++++--------- .../plugin-block/src/block-provider.ts | 6 -- storybook/stories/crepe/setup.ts | 4 ++ 7 files changed, 92 insertions(+), 61 deletions(-) create mode 100644 .changeset/green-spies-jam.md diff --git a/.changeset/green-spies-jam.md b/.changeset/green-spies-jam.md new file mode 100644 index 00000000000..9670b73a03e --- /dev/null +++ b/.changeset/green-spies-jam.md @@ -0,0 +1,8 @@ +--- +"@milkdown/plugin-block": patch +"@milkdown/components": patch +"@milkdown/crepe": patch +"@milkdown/kit": patch +--- + +Fix plugin block bugs diff --git a/packages/components/src/table-block/view/utils.ts b/packages/components/src/table-block/view/utils.ts index 62056a21ea2..5032e645ccc 100644 --- a/packages/components/src/table-block/view/utils.ts +++ b/packages/components/src/table-block/view/utils.ts @@ -20,31 +20,37 @@ export function findNodeIndex(parent: Node, child: Node) { export function findPointerIndex(event: PointerEvent, view?: EditorView): CellIndex | undefined { if (!view) return - const posAtCoords = view.posAtCoords({ left: event.clientX, top: event.clientY }) - if (!posAtCoords) - return - const pos = posAtCoords?.inside - if (pos == null || pos < 0) - return - const $pos = view.state.doc.resolve(pos) - const node = view.state.doc.nodeAt(pos) - if (!node) - return + try { + const posAtCoords = view.posAtCoords({ left: event.clientX, top: event.clientY }) + if (!posAtCoords) + return + const pos = posAtCoords?.inside + if (pos == null || pos < 0) + return - const cellType = ['table_cell', 'table_header'] - const rowType = ['table_row', 'table_header_row'] + const $pos = view.state.doc.resolve(pos) + const node = view.state.doc.nodeAt(pos) + if (!node) + return - const cell = cellType.includes(node.type.name) ? node : findParent(node => cellType.includes(node.type.name))($pos)?.node - const row = findParent(node => rowType.includes(node.type.name))($pos)?.node - const table = findParent(node => node.type.name === 'table')($pos)?.node - if (!cell || !row || !table) - return + const cellType = ['table_cell', 'table_header'] + const rowType = ['table_row', 'table_header_row'] + + const cell = cellType.includes(node.type.name) ? node : findParent(node => cellType.includes(node.type.name))($pos)?.node + const row = findParent(node => rowType.includes(node.type.name))($pos)?.node + const table = findParent(node => node.type.name === 'table')($pos)?.node + if (!cell || !row || !table) + return - const columnIndex = findNodeIndex(row, cell) - const rowIndex = findNodeIndex(table, row) + const columnIndex = findNodeIndex(row, cell) + const rowIndex = findNodeIndex(table, row) - return [rowIndex, columnIndex] + return [rowIndex, columnIndex] + } + catch { + return undefined + } } export function getRelatedDOM(contentWrapperRef: Ref, [rowIndex, columnIndex]: CellIndex) { diff --git a/packages/crepe/src/feature/block-edit/handle/index.ts b/packages/crepe/src/feature/block-edit/handle/index.ts index 5059f5aa444..547cee63a5c 100644 --- a/packages/crepe/src/feature/block-edit/handle/index.ts +++ b/packages/crepe/src/feature/block-edit/handle/index.ts @@ -1,10 +1,11 @@ import type { PluginView } from '@milkdown/kit/prose/state' import { TextSelection } from '@milkdown/kit/prose/state' -import { BlockProvider, block } from '@milkdown/kit/plugin/block' +import { BlockProvider, block, blockConfig } from '@milkdown/kit/plugin/block' import type { Ctx } from '@milkdown/kit/ctx' import type { AtomicoThis } from 'atomico/types/dom' import { editorViewCtx } from '@milkdown/kit/core' import { paragraphSchema } from '@milkdown/kit/preset/commonmark' +import { findParent } from '@milkdown/kit/prose' import { menuAPI } from '../menu' import { defIfNotExists } from '../../../utils' import type { BlockEditFeatureConfig } from '../index' @@ -28,6 +29,9 @@ export class BlockHandleView implements PluginView { content, getOffset: () => 16, getPlacement: ({ active, blockDom }) => { + if (active.node.type.name === 'heading') + return 'left' + let totalDescendant = 0 active.node.descendants((node) => { totalDescendant += node.childCount @@ -40,7 +44,7 @@ export class BlockHandleView implements PluginView { const paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0 const height = domRect.height - paddingTop - paddingBottom const handleHeight = handleRect.height - return totalDescendant > 2 || handleHeight * 2 < height ? 'left-start' : 'left' + return totalDescendant > 2 || handleHeight < height ? 'left-start' : 'left' }, }) this.update() @@ -79,6 +83,15 @@ export class BlockHandleView implements PluginView { defIfNotExists('milkdown-block-handle', BlockHandleElement) export function configureBlockHandle(ctx: Ctx, config?: BlockEditFeatureConfig) { + ctx.set(blockConfig.key, { + filterNodes: (pos) => { + const filter = findParent(node => ['table', 'blockquote'].includes(node.type.name))(pos) + if (filter) + return false + + return true + }, + }) ctx.set(block.key, { view: () => new BlockHandleView(ctx, config), }) diff --git a/packages/crepe/src/theme/common/block-edit.css b/packages/crepe/src/theme/common/block-edit.css index 339bf46aa37..2bee5ff087a 100644 --- a/packages/crepe/src/theme/common/block-edit.css +++ b/packages/crepe/src/theme/common/block-edit.css @@ -2,6 +2,7 @@ milkdown-block-handle { &[data-show='false'] { opacity: 0; + pointer-events: none; } transition: all 0.2s; position: absolute; diff --git a/packages/plugins/plugin-block/src/__internal__/select-node-by-dom.ts b/packages/plugins/plugin-block/src/__internal__/select-node-by-dom.ts index 2ee08ba6e08..e45d07a5e73 100644 --- a/packages/plugins/plugin-block/src/__internal__/select-node-by-dom.ts +++ b/packages/plugins/plugin-block/src/__internal__/select-node-by-dom.ts @@ -8,39 +8,44 @@ export function selectRootNodeByDom(view: EditorView, coords: { x: number, y: nu if (!root) return null - const pos = view.posAtCoords({ - left: coords.x, - top: coords.y, - })?.inside - if (pos == null || pos < 0) - return null - - let $pos = view.state.doc.resolve(pos) - let node = view.state.doc.nodeAt(pos) - let element = view.nodeDOM(pos) as HTMLElement | null - - const filter = (needLookup: boolean) => { - const checkDepth = $pos.depth >= 1 && $pos.index($pos.depth) === 0 - const shouldLookUp = needLookup || checkDepth - - if (!shouldLookUp) - return - - const ancestorPos = $pos.before($pos.depth) - node = view.state.doc.nodeAt(ancestorPos) - element = view.nodeDOM(ancestorPos) as HTMLElement | null - $pos = view.state.doc.resolve(ancestorPos) - - if (!filterNodes($pos, node!)) - filter(true) + try { + const pos = view.posAtCoords({ + left: coords.x, + top: coords.y, + })?.inside + if (pos == null || pos < 0) + return null + + let $pos = view.state.doc.resolve(pos) + let node = view.state.doc.nodeAt(pos) + let element = view.nodeDOM(pos) as HTMLElement | null + + const filter = (needLookup: boolean) => { + const checkDepth = $pos.depth >= 1 && $pos.index($pos.depth) === 0 + const shouldLookUp = needLookup || checkDepth + + if (!shouldLookUp) + return + + const ancestorPos = $pos.before($pos.depth) + node = view.state.doc.nodeAt(ancestorPos) + element = view.nodeDOM(ancestorPos) as HTMLElement | null + $pos = view.state.doc.resolve(ancestorPos) + + if (!filterNodes($pos, node!)) + filter(true) + } + + // If filterNodes returns false, we should look up the parent node. + const filterResult = filterNodes($pos, node!) + filter(!filterResult) + + if (!element || !node) + return null + + return { node, $pos, el: element } } - - // If filterNodes returns false, we should look up the parent node. - const filterResult = filterNodes($pos, node!) - filter(!filterResult) - - if (!element || !node) + catch { return null - - return { node, $pos, el: element } + } } diff --git a/packages/plugins/plugin-block/src/block-provider.ts b/packages/plugins/plugin-block/src/block-provider.ts index e2faa3e78ae..c62d6c99eaa 100644 --- a/packages/plugins/plugin-block/src/block-provider.ts +++ b/packages/plugins/plugin-block/src/block-provider.ts @@ -170,11 +170,5 @@ export class BlockProvider { /// Hide the block. hide = () => { this.#element.dataset.show = 'false' - setTimeout(() => { - Object.assign(this.#element.style, { - left: `-999px`, - top: `-999px`, - }) - }, 200) } } diff --git a/storybook/stories/crepe/setup.ts b/storybook/stories/crepe/setup.ts index 008123c1f62..a7bcfefb577 100644 --- a/storybook/stories/crepe/setup.ts +++ b/storybook/stories/crepe/setup.ts @@ -127,6 +127,10 @@ const crepe = new Crepe({ > > No escape from [reality](https://en.wikipedia.org/wiki/Bohemian_Rhapsody). +Open your eyes, look up to the skies and see. + +I'm just a poor boy, I need no sympathy, because I'm easy come, easy go, little high, little low. + | Fruit | Animal | Vegetable | | ----- | :----: | --------: | | 🍎 | 🐱 | 🥕 | From b9e1ce51427469e1c33dcd90177c5f3c342818f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 23:56:10 +0800 Subject: [PATCH 3/6] ci(changeset): release milkdown (#1486) Co-authored-by: github-actions[bot] --- .changeset/green-spies-jam.md | 8 -------- packages/components/CHANGELOG.md | 6 ++++++ packages/components/package.json | 2 +- packages/crepe/CHANGELOG.md | 8 ++++++++ packages/crepe/package.json | 2 +- packages/kit/CHANGELOG.md | 9 +++++++++ packages/kit/package.json | 2 +- packages/plugins/plugin-block/CHANGELOG.md | 6 ++++++ packages/plugins/plugin-block/package.json | 2 +- storybook/CHANGELOG.md | 8 ++++++++ storybook/package.json | 2 +- 11 files changed, 42 insertions(+), 13 deletions(-) delete mode 100644 .changeset/green-spies-jam.md diff --git a/.changeset/green-spies-jam.md b/.changeset/green-spies-jam.md deleted file mode 100644 index 9670b73a03e..00000000000 --- a/.changeset/green-spies-jam.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@milkdown/plugin-block": patch -"@milkdown/components": patch -"@milkdown/crepe": patch -"@milkdown/kit": patch ---- - -Fix plugin block bugs diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index a84c4377d25..988a196473c 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -1,5 +1,11 @@ # @milkdown/components +## 7.5.4 + +### Patch Changes + +- 705c263: Fix plugin block bugs + ## 7.5.3 ### Patch Changes diff --git a/packages/components/package.json b/packages/components/package.json index 8698900bcaf..4e21d96980e 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,7 +1,7 @@ { "name": "@milkdown/components", "type": "module", - "version": "7.5.3", + "version": "7.5.4", "license": "MIT", "repository": { "type": "git", diff --git a/packages/crepe/CHANGELOG.md b/packages/crepe/CHANGELOG.md index 3e12eb52895..8a920b6aa6e 100644 --- a/packages/crepe/CHANGELOG.md +++ b/packages/crepe/CHANGELOG.md @@ -1,5 +1,13 @@ # @milkdown/crepe +## 7.5.4 + +### Patch Changes + +- 705c263: Fix plugin block bugs +- Updated dependencies [705c263] + - @milkdown/kit@7.5.4 + ## 7.5.3 ### Patch Changes diff --git a/packages/crepe/package.json b/packages/crepe/package.json index 105655ebc5c..7e545bb03a3 100644 --- a/packages/crepe/package.json +++ b/packages/crepe/package.json @@ -1,7 +1,7 @@ { "name": "@milkdown/crepe", "type": "module", - "version": "7.5.3", + "version": "7.5.4", "license": "MIT", "repository": { "type": "git", diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md index f3b60f51416..44869dd2034 100644 --- a/packages/kit/CHANGELOG.md +++ b/packages/kit/CHANGELOG.md @@ -1,5 +1,14 @@ # @milkdown/kit +## 7.5.4 + +### Patch Changes + +- 705c263: Fix plugin block bugs +- Updated dependencies [705c263] + - @milkdown/plugin-block@7.5.4 + - @milkdown/components@7.5.4 + ## 7.5.3 ### Patch Changes diff --git a/packages/kit/package.json b/packages/kit/package.json index 6991a13143c..cc350529657 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -1,7 +1,7 @@ { "name": "@milkdown/kit", "type": "module", - "version": "7.5.3", + "version": "7.5.4", "license": "MIT", "repository": { "type": "git", diff --git a/packages/plugins/plugin-block/CHANGELOG.md b/packages/plugins/plugin-block/CHANGELOG.md index aa1ee19465f..91f733bb899 100644 --- a/packages/plugins/plugin-block/CHANGELOG.md +++ b/packages/plugins/plugin-block/CHANGELOG.md @@ -1,5 +1,11 @@ # @milkdown/plugin-block +## 7.5.4 + +### Patch Changes + +- 705c263: Fix plugin block bugs + ## 7.5.0 ### Minor Changes diff --git a/packages/plugins/plugin-block/package.json b/packages/plugins/plugin-block/package.json index f9e5f6151d1..19a96e1d753 100644 --- a/packages/plugins/plugin-block/package.json +++ b/packages/plugins/plugin-block/package.json @@ -1,7 +1,7 @@ { "name": "@milkdown/plugin-block", "type": "module", - "version": "7.5.0", + "version": "7.5.4", "license": "MIT", "repository": { "type": "git", diff --git a/storybook/CHANGELOG.md b/storybook/CHANGELOG.md index b4c3e64f107..35b9bc59210 100644 --- a/storybook/CHANGELOG.md +++ b/storybook/CHANGELOG.md @@ -1,5 +1,13 @@ # @milkdown/storybook +## 7.5.4 + +### Patch Changes + +- Updated dependencies [705c263] + - @milkdown/crepe@7.5.4 + - @milkdown/kit@7.5.4 + ## 7.5.3 ### Patch Changes diff --git a/storybook/package.json b/storybook/package.json index 107f354ed28..f6f72d40ab5 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -1,6 +1,6 @@ { "name": "@milkdown/storybook", - "version": "7.5.3", + "version": "7.5.4", "private": true, "files": [ "style" From 56af3f5acfc1566dac0149e7725a9c2b3ab053d6 Mon Sep 17 00:00:00 2001 From: Mirone Date: Sun, 25 Aug 2024 17:26:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20optimize=20table=20d?= =?UTF-8?q?nd=20behavior=20(#1487)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 🎸 optimize table dnd behavior * chore: fix * chore: fix drop dnd * chore: fix --- .changeset/polite-dancers-mix.md | 7 +++++++ .../components/src/table-block/view/drag.ts | 20 +++++++++++++++---- .../src/table-block/view/operation.ts | 6 ++++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 .changeset/polite-dancers-mix.md diff --git a/.changeset/polite-dancers-mix.md b/.changeset/polite-dancers-mix.md new file mode 100644 index 00000000000..1af1002754e --- /dev/null +++ b/.changeset/polite-dancers-mix.md @@ -0,0 +1,7 @@ +--- +"@milkdown/components": patch +"@milkdown/crepe": patch +"@milkdown/kit": patch +--- + +Optimize table drag behavior diff --git a/packages/components/src/table-block/view/drag.ts b/packages/components/src/table-block/view/drag.ts index d53b4c0460d..b5e7f7c3966 100644 --- a/packages/components/src/table-block/view/drag.ts +++ b/packages/components/src/table-block/view/drag.ts @@ -243,15 +243,19 @@ export function createDragOverHandler(refs: Refs): (e: DragEvent) => void { const children = Array.from(firstRow.children) const col = children.find((col, index) => { const boundary = col.getBoundingClientRect() - const boundaryLeft = boundary.left + wrapperOffsetLeft - left - const boundaryRight = boundary.right + wrapperOffsetLeft - left + let boundaryLeft = boundary.left + wrapperOffsetLeft - left + let boundaryRight = boundary.right + wrapperOffsetLeft - left if (direction === 'right') { + boundaryLeft = boundaryLeft + boundary.width / 2 + boundaryRight = boundaryRight + boundary.width / 2 if (boundaryLeft <= previewRight && boundaryRight >= previewRight) return true if (index === firstRow.children.length - 1 && previewRight > boundaryRight) return true } else { + boundaryLeft = boundaryLeft - boundary.width / 2 + boundaryRight = boundaryRight - boundary.width / 2 if (boundaryLeft <= previewLeft && boundaryRight >= previewLeft) return true if (index === 0 && previewLeft < boundaryLeft) @@ -303,15 +307,19 @@ export function createDragOverHandler(refs: Refs): (e: DragEvent) => void { const rows = Array.from(contentRoot.querySelectorAll('tr')) const row = rows.find((row, index) => { const boundary = row.getBoundingClientRect() - const boundaryTop = boundary.top + wrapperOffsetTop - top - const boundaryBottom = boundary.bottom + wrapperOffsetTop - top + let boundaryTop = boundary.top + wrapperOffsetTop - top + let boundaryBottom = boundary.bottom + wrapperOffsetTop - top if (direction === 'down') { + boundaryTop = boundaryTop + boundary.height / 2 + boundaryBottom = boundaryBottom + boundary.height / 2 if (boundaryTop <= previewBottom && boundaryBottom >= previewBottom) return true if (index === rows.length - 1 && previewBottom > boundaryBottom) return true } else { + boundaryTop = boundaryTop - boundary.height / 2 + boundaryBottom = boundaryBottom - boundary.height / 2 if (boundaryTop <= previewTop && boundaryBottom >= previewTop) return true if (index === 0 && previewTop < boundaryTop) @@ -436,6 +444,10 @@ export function useDragHandlers( index, }) } + + requestAnimationFrame(() => { + ctx.get(editorViewCtx).focus() + }) } const onDragOver = createDragOverHandler(refs) diff --git a/packages/components/src/table-block/view/operation.ts b/packages/components/src/table-block/view/operation.ts index 8c8d5fa7c75..7b292ece5d1 100644 --- a/packages/components/src/table-block/view/operation.ts +++ b/packages/components/src/table-block/view/operation.ts @@ -118,6 +118,9 @@ export function useOperation(refs: Refs, ctx?: Ctx, getPos?: () => number | unde e.stopPropagation() const commands = ctx.get(commandsCtx) commands.call(deleteSelectedCellsCommand.key) + requestAnimationFrame(() => { + ctx.get(editorViewCtx).focus() + }) }, []) const onAlign = useCallback((direction: 'left' | 'center' | 'right') => @@ -132,6 +135,9 @@ export function useOperation(refs: Refs, ctx?: Ctx, getPos?: () => number | unde e.stopPropagation() const commands = ctx.get(commandsCtx) commands.call(setAlignCommand.key, direction) + requestAnimationFrame(() => { + ctx.get(editorViewCtx).focus() + }) }, []) return { From 0ee64866234e660b92f93006f85fe947d8b72c73 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:32:47 +0800 Subject: [PATCH 5/6] ci(changeset): release milkdown (#1488) Co-authored-by: github-actions[bot] --- .changeset/polite-dancers-mix.md | 7 ------- packages/components/CHANGELOG.md | 6 ++++++ packages/components/package.json | 2 +- packages/crepe/CHANGELOG.md | 8 ++++++++ packages/crepe/package.json | 2 +- packages/kit/CHANGELOG.md | 8 ++++++++ packages/kit/package.json | 2 +- storybook/CHANGELOG.md | 8 ++++++++ storybook/package.json | 2 +- 9 files changed, 34 insertions(+), 11 deletions(-) delete mode 100644 .changeset/polite-dancers-mix.md diff --git a/.changeset/polite-dancers-mix.md b/.changeset/polite-dancers-mix.md deleted file mode 100644 index 1af1002754e..00000000000 --- a/.changeset/polite-dancers-mix.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@milkdown/components": patch -"@milkdown/crepe": patch -"@milkdown/kit": patch ---- - -Optimize table drag behavior diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 988a196473c..3fb2c4e013b 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -1,5 +1,11 @@ # @milkdown/components +## 7.5.5 + +### Patch Changes + +- 56af3f5: Optimize table drag behavior + ## 7.5.4 ### Patch Changes diff --git a/packages/components/package.json b/packages/components/package.json index 4e21d96980e..c479746c5c7 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,7 +1,7 @@ { "name": "@milkdown/components", "type": "module", - "version": "7.5.4", + "version": "7.5.5", "license": "MIT", "repository": { "type": "git", diff --git a/packages/crepe/CHANGELOG.md b/packages/crepe/CHANGELOG.md index 8a920b6aa6e..01c4fcf3675 100644 --- a/packages/crepe/CHANGELOG.md +++ b/packages/crepe/CHANGELOG.md @@ -1,5 +1,13 @@ # @milkdown/crepe +## 7.5.5 + +### Patch Changes + +- 56af3f5: Optimize table drag behavior +- Updated dependencies [56af3f5] + - @milkdown/kit@7.5.5 + ## 7.5.4 ### Patch Changes diff --git a/packages/crepe/package.json b/packages/crepe/package.json index 7e545bb03a3..55f238b5dca 100644 --- a/packages/crepe/package.json +++ b/packages/crepe/package.json @@ -1,7 +1,7 @@ { "name": "@milkdown/crepe", "type": "module", - "version": "7.5.4", + "version": "7.5.5", "license": "MIT", "repository": { "type": "git", diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md index 44869dd2034..2682626d79d 100644 --- a/packages/kit/CHANGELOG.md +++ b/packages/kit/CHANGELOG.md @@ -1,5 +1,13 @@ # @milkdown/kit +## 7.5.5 + +### Patch Changes + +- 56af3f5: Optimize table drag behavior +- Updated dependencies [56af3f5] + - @milkdown/components@7.5.5 + ## 7.5.4 ### Patch Changes diff --git a/packages/kit/package.json b/packages/kit/package.json index cc350529657..7c045e57594 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -1,7 +1,7 @@ { "name": "@milkdown/kit", "type": "module", - "version": "7.5.4", + "version": "7.5.5", "license": "MIT", "repository": { "type": "git", diff --git a/storybook/CHANGELOG.md b/storybook/CHANGELOG.md index 35b9bc59210..f21933bf344 100644 --- a/storybook/CHANGELOG.md +++ b/storybook/CHANGELOG.md @@ -1,5 +1,13 @@ # @milkdown/storybook +## 7.5.5 + +### Patch Changes + +- Updated dependencies [56af3f5] + - @milkdown/crepe@7.5.5 + - @milkdown/kit@7.5.5 + ## 7.5.4 ### Patch Changes diff --git a/storybook/package.json b/storybook/package.json index f6f72d40ab5..052365685ee 100644 --- a/storybook/package.json +++ b/storybook/package.json @@ -1,6 +1,6 @@ { "name": "@milkdown/storybook", - "version": "7.5.4", + "version": "7.5.5", "private": true, "files": [ "style" From 9012353c63a5df2b7f1f2f04e409d6ece91f6124 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 23:00:00 +0800 Subject: [PATCH 6/6] chore(deps): update dependency jsdom to v25 (#1483) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 77 +++++++++++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 427fd350fb0..38088c2394b 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "eslint-plugin-tailwindcss": "^3.15.1", "git-cz": "^4.7.6", "husky": "^9.0.10", - "jsdom": "^24.0.0", + "jsdom": "^25.0.0", "lint-staged": "^15.0.0", "nx": "19.6.2", "pathe": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7d12f154b1..5247f5ce1ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,7 +36,7 @@ importers: devDependencies: '@antfu/eslint-config': specifier: ^2.16.2 - version: 2.16.2(@eslint-react/eslint-plugin@1.5.10(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(@vue/compiler-sfc@3.4.21)(eslint-plugin-react-hooks@4.6.2(eslint@9.2.0))(eslint-plugin-react-refresh@0.4.6(eslint@9.2.0))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@24.0.0)) + version: 2.16.2(@eslint-react/eslint-plugin@1.5.10(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(@vue/compiler-sfc@3.4.21)(eslint-plugin-react-hooks@4.6.2(eslint@9.2.0))(eslint-plugin-react-refresh@0.4.6(eslint@9.2.0))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@25.0.0)) '@changesets/cli': specifier: ^2.22.0 version: 2.27.1 @@ -134,8 +134,8 @@ importers: specifier: ^9.0.10 version: 9.0.10 jsdom: - specifier: ^24.0.0 - version: 24.0.0 + specifier: ^25.0.0 + version: 25.0.0 lint-staged: specifier: ^15.0.0 version: 15.2.0 @@ -189,7 +189,7 @@ importers: version: 5.0.13(@types/node@20.10.5) vitest: specifier: ^2.0.0 - version: 2.0.1(@types/node@20.10.5)(jsdom@24.0.0) + version: 2.0.1(@types/node@20.10.5)(jsdom@25.0.0) e2e: dependencies: @@ -5990,8 +5990,8 @@ packages: resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} engines: {node: '>= 0.8'} - http-proxy-agent@7.0.0: - resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==} + http-proxy-agent@7.0.2: + resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} engines: {node: '>= 14'} http-proxy@1.18.1: @@ -6007,8 +6007,8 @@ packages: resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==} engines: {node: '>=0.10'} - https-proxy-agent@7.0.2: - resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==} + https-proxy-agent@7.0.5: + resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==} engines: {node: '>= 14'} human-id@1.0.2: @@ -6320,8 +6320,8 @@ packages: resolution: {integrity: sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==} engines: {node: '>=12.0.0'} - jsdom@24.0.0: - resolution: {integrity: sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==} + jsdom@25.0.0: + resolution: {integrity: sha512-OhoFVT59T7aEq75TVw9xxEfkXgacpqAhQaYgP9y/fDqWQCMB/b1H66RfmPm/MaeaAIU9nDwMOVTlPN51+ao6CQ==} engines: {node: '>=18'} peerDependencies: canvas: ^2.11.2 @@ -7059,8 +7059,8 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} - nwsapi@2.2.7: - resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} + nwsapi@2.2.12: + resolution: {integrity: sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==} nx@19.6.2: resolution: {integrity: sha512-uUC9glC/QDsDhfOSzWl1id9rfUVepVwLhwBGRMeO5K6+Tju7qAsRGZ2NGPoUz6J1AZuWtlKZcr+MOSK2U4+2wQ==} @@ -8019,6 +8019,9 @@ packages: rrweb-cssom@0.6.0: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} + rrweb-cssom@0.7.1: + resolution: {integrity: sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==} + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -8452,8 +8455,8 @@ packages: resolution: {integrity: sha512-moYoCvkNUAPCxSW9jmHmRElhm4tVJpHL8ItC/+uYD0EpPSFXbck7yREz9tNdJVTSpHVod8+HoipcpbQ0oE6gsw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - tough-cookie@4.1.3: - resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==} + tough-cookie@4.1.4: + resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==} engines: {node: '>=6'} tr46@5.0.0: @@ -8886,8 +8889,8 @@ packages: write-file-atomic@2.4.3: resolution: {integrity: sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==} - ws@8.16.0: - resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==} + ws@8.18.0: + resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 @@ -9007,7 +9010,7 @@ snapshots: '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 - '@antfu/eslint-config@2.16.2(@eslint-react/eslint-plugin@1.5.10(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(@vue/compiler-sfc@3.4.21)(eslint-plugin-react-hooks@4.6.2(eslint@9.2.0))(eslint-plugin-react-refresh@0.4.6(eslint@9.2.0))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@24.0.0))': + '@antfu/eslint-config@2.16.2(@eslint-react/eslint-plugin@1.5.10(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(@vue/compiler-sfc@3.4.21)(eslint-plugin-react-hooks@4.6.2(eslint@9.2.0))(eslint-plugin-react-refresh@0.4.6(eslint@9.2.0))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@25.0.0))': dependencies: '@antfu/install-pkg': 0.3.3 '@clack/prompts': 0.7.0 @@ -9031,7 +9034,7 @@ snapshots: eslint-plugin-toml: 0.11.0(eslint@9.2.0) eslint-plugin-unicorn: 52.0.0(eslint@9.2.0) eslint-plugin-unused-imports: 3.2.0(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0) - eslint-plugin-vitest: 0.5.4(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@24.0.0)) + eslint-plugin-vitest: 0.5.4(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@25.0.0)) eslint-plugin-vue: 9.25.0(eslint@9.2.0) eslint-plugin-yml: 1.14.0(eslint@9.2.0) eslint-processor-vue-blocks: 0.1.2(@vue/compiler-sfc@3.4.21)(eslint@9.2.0) @@ -10604,7 +10607,7 @@ snapshots: performance-now: 2.1.0 qs: 6.10.4 safe-buffer: 5.2.1 - tough-cookie: 4.1.3 + tough-cookie: 4.1.4 tunnel-agent: 0.6.0 uuid: 8.3.2 @@ -11797,7 +11800,7 @@ snapshots: process: 0.11.10 recast: 0.23.6 util: 0.12.5 - ws: 8.16.0 + ws: 8.18.0 transitivePeerDependencies: - bufferutil - supports-color @@ -14279,13 +14282,13 @@ snapshots: optionalDependencies: '@typescript-eslint/eslint-plugin': 7.7.1(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4) - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@24.0.0)): + eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@7.7.1(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4)(vitest@2.0.1(@types/node@20.10.5)(jsdom@25.0.0)): dependencies: '@typescript-eslint/utils': 7.8.0(eslint@9.2.0)(typescript@5.4.4) eslint: 9.2.0 optionalDependencies: '@typescript-eslint/eslint-plugin': 7.7.1(@typescript-eslint/parser@7.7.1(eslint@9.2.0)(typescript@5.4.4))(eslint@9.2.0)(typescript@5.4.4) - vitest: 2.0.1(@types/node@20.10.5)(jsdom@24.0.0) + vitest: 2.0.1(@types/node@20.10.5)(jsdom@25.0.0) transitivePeerDependencies: - supports-color - typescript @@ -14905,7 +14908,7 @@ snapshots: statuses: 2.0.1 toidentifier: 1.0.1 - http-proxy-agent@7.0.0: + http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.0 debug: 4.3.5(supports-color@8.1.1) @@ -14945,7 +14948,7 @@ snapshots: jsprim: 2.0.2 sshpk: 1.18.0 - https-proxy-agent@7.0.2: + https-proxy-agent@7.0.5: dependencies: agent-base: 7.1.0 debug: 4.3.5(supports-color@8.1.1) @@ -15207,28 +15210,28 @@ snapshots: jsdoc-type-pratt-parser@4.0.0: {} - jsdom@24.0.0: + jsdom@25.0.0: dependencies: cssstyle: 4.0.1 data-urls: 5.0.0 decimal.js: 10.4.3 form-data: 4.0.0 html-encoding-sniffer: 4.0.0 - http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.2 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.5 is-potential-custom-element-name: 1.0.1 - nwsapi: 2.2.7 + nwsapi: 2.2.12 parse5: 7.1.2 - rrweb-cssom: 0.6.0 + rrweb-cssom: 0.7.1 saxes: 6.0.0 symbol-tree: 3.2.4 - tough-cookie: 4.1.3 + tough-cookie: 4.1.4 w3c-xmlserializer: 5.0.0 webidl-conversions: 7.0.0 whatwg-encoding: 3.1.1 whatwg-mimetype: 4.0.0 whatwg-url: 14.0.0 - ws: 8.16.0 + ws: 8.18.0 xml-name-validator: 5.0.0 transitivePeerDependencies: - bufferutil @@ -16227,7 +16230,7 @@ snapshots: dependencies: boolbase: 1.0.0 - nwsapi@2.2.7: {} + nwsapi@2.2.12: {} nx@19.6.2(@swc-node/register@1.10.9(@swc/core@1.7.5(@swc/helpers@0.5.12))(@swc/types@0.1.12)(typescript@5.4.4))(@swc/core@1.7.5(@swc/helpers@0.5.12)): dependencies: @@ -17323,6 +17326,8 @@ snapshots: rrweb-cssom@0.6.0: {} + rrweb-cssom@0.7.1: {} + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -17821,7 +17826,7 @@ snapshots: dependencies: eslint-visitor-keys: 3.4.3 - tough-cookie@4.1.3: + tough-cookie@4.1.4: dependencies: psl: 1.9.0 punycode: 2.3.1 @@ -18117,7 +18122,7 @@ snapshots: '@types/node': 20.10.5 fsevents: 2.3.3 - vitest@2.0.1(@types/node@20.10.5)(jsdom@24.0.0): + vitest@2.0.1(@types/node@20.10.5)(jsdom@25.0.0): dependencies: '@ampproject/remapping': 2.3.0 '@vitest/expect': 2.0.1 @@ -18139,7 +18144,7 @@ snapshots: why-is-node-running: 2.2.2 optionalDependencies: '@types/node': 20.10.5 - jsdom: 24.0.0 + jsdom: 25.0.0 transitivePeerDependencies: - less - lightningcss @@ -18263,7 +18268,7 @@ snapshots: imurmurhash: 0.1.4 signal-exit: 3.0.7 - ws@8.16.0: {} + ws@8.18.0: {} xml-name-validator@4.0.0: {}