fix: throw error when render edge without terminal (#3331)

[@antv/x6-sites@1.6.3](https://github.com/antvis/X6/releases/tag/%40antv/x6-sites%401.6.3)

.github/workflows/release.yml

@@ -15,7 +15,8 @@ jobs:
     steps:
       - name: ⤵️　Checkout
         uses: actions/checkout@v3
-
+        with:
+          persist-credentials: false
       - name: 🎉　Setup nodejs
         uses: actions/setup-node@v3
         with:

.github/workflows/welcome.yml

@@ -20,9 +20,7 @@ jobs:
             👋 @{{ author }}
 
             Thanks for opening your first issue here! If you're reporting a 🐞 bug, please make sure you include steps to reproduce it.
-
             To help make it easier for us to investigate your issue, please follow the [contributing guidelines](https://github.com/antvis/X6/blob/master/CONTRIBUTING.md).
-
             We get a lot of issues on this repo, so please be patient and we will get back to you as soon as we can.
 
           FIRST_PR: |

CONTRIBUTORS

@@ -1,22 +1,24 @@
 BARM <284942955@qq.com>
 Candy <563378816@qq.com>
-Chaoqi <HAN>
-Clifford <ajard>
+Chaoqi ZHANG <prncoprs@163.com>
+Clifford Fajardo <cliffordfajardo@users.noreply.github.com>
 DaiGang <42136433+daigang666@users.noreply.github.com>
 Dong <48054715+halodong@users.noreply.github.com>
 Draco <Draco.coder@gmail.com>
 Eve-Sama <17764594863@163.com>
 Eve-Sama <948832626@qq.com>
 Gossypol <31892817+gossypol@users.noreply.github.com>
+HQidea <HQidea@users.noreply.github.com>
 ImgBotApp <ImgBotHelp@gmail.com>
 Indomi <indomi126@gmail.com>
-James <san>
-Jógvan <lse>
-Ken <ei>
-Kent <oo>
+James Tsang <wtzeng1@gmail.com>
+Jógvan Olsen <jogvanolsen@hotmail.com>
+Ken Geis <geis.ken@gmail.com>
+Kent Wood <minzojian@hotmail.com>
+Ko.Rei <32183014+Ko-Rei@users.noreply.github.com>
 Limbo <49612796+JUST-Limbo@users.noreply.github.com>
 Lixu <37231473+wflixu@users.noreply.github.com>
-Lloyd <ho>
+Lloyd Zhou <lloydzhou@users.noreply.github.com>
 Lyn <47809781+lyn-boyu@users.noreply.github.com>
 MOMO <329053928@qq.com>
 Mingfei <az8641683@163.com>
@@ -26,17 +28,22 @@ NewByVector <NewByVector@users.noreply.github.com>
 Olive.Wang <olivewind.wang@gmail.com>
 Opportunity <opportunity@live.in>
 Questions <chip@twostewards.com>
-RuiLin <on>
+RuiLin Dong <48054715+halodong@users.noreply.github.com>
 SSC <273702440@qq.com>
-Simon <>
+Samuel Bodin <1637651+bodinsamuel@users.noreply.github.com>
+Simon He <57086651+Simon-He95@users.noreply.github.com>
 Sindori <441933726@qq.com>
+Struggle <1178825961@qq.com>
+Struggle Roue <47975400+struggleRoue@users.noreply.github.com>
 Susan <527971893@qq.com>
-Thomas <eugne>
-Tony <>
+Thomas Zeugner <tomsoftware@gmx.de>
+Tony Wu <93302820+tonywu6@users.noreply.github.com>
 Utopia <greatauk11@gmail.com>
 XLZY <1017866168@qq.com>
-Xingjian <han>
-Zhenyu <o>
+Xia Wenqi <xiawenqi90@gmail.com>
+Xingjian Zhang <44231913+THUzxj@users.noreply.github.com>
+Zhenyu Hou <skyking_H@hotmail.com>
+_XiaoTian <istianlei@qq.com>
 arthur657834 <kingkom7834@126.com>
 boyu.zlj <boyu.zlj@antgroup.com>
 breezefaith <nyzhangzc@qq.com>
@@ -52,6 +59,8 @@ kelin.zrh <34393362+AricZhu@users.noreply.github.com>
 kingshuaishuai <ken.wang@mrs.ai>
 kio <1421104933@qq.com>
 lijing666 <lijing241@yeah.net>
+linkun <33945539+linkun-wang@users.noreply.github.com>
+linkun <linkun0922@163.com>
 lopn <lopnxrp@126.com>
 luchunwei <luchunwei@gmail.com>
 luzhuang <364439895@qq.com>
@@ -61,17 +70,20 @@ newbyvector <vectorse@126.com>
 niexq <1879633916@qq.com>
 niexq <niexq@firstgrid.cn>
 njshuisheng <34205271+njshuisheng@users.noreply.github.com>
+nobugforever <84232410+mengYu-Jin@users.noreply.github.com>
 pengxingjian.pxj <pengxingjian.pxj@alibaba-inc.com>
 pfdgithub <pfdgithub@users.noreply.github.com>
 qingchi <qinky94@163.com>
 qu <33251372+Qujh97@users.noreply.github.com>
 sallen450 <qinghua10199@gmail.com>
 semantic-release-bot <semantic-release-bot@martynus.net>
+siaikin <abc1310054026@outlook.com>
 vector <vectorse@126.com>
 wenbei <38773084+wb-wenbei@users.noreply.github.com>
 wgf <34190465+evelope@users.noreply.github.com>
-wind <>
+wind X <35559153+XueMeijing@users.noreply.github.com>
 wjqsummer <52412389+wjqsummer@users.noreply.github.com>
+wseven7677 <caoyu_92@126.com>
 wtzeng1 <wtzeng1@gmail.com>
 x6-bot <x6-bot@users.noreply.github.com>
 xrkffgg <xrkffgg@gmail.com>
@@ -80,10 +92,12 @@ zdc1111 <39116292+zdc1111@users.noreply.github.com>
 €alix <qq287649920@gmail.com>
 九思⚡⚡⚡ <2228429150@qq.com>
 何腾飞 <avrin.live.cn@outlook.com>
+依枫 <deng25st@163.com>
 偏右 <afc163@gmail.com>
 小耀 <jinyue.gjy@antfin.com>
 崖 <bubkoo.wy@gmail.com>
 崖崖崖 <bubkoo.wy@gmail.com>
+张子睿 <411489774@qq.com>
 文瑀 <wenyu.jqq@antfin.com>
 映月 <38279397+orientMoon@users.noreply.github.com>
 杨凌 <89915256@qq.com>

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.en-us.md

@@ -90,6 +90,7 @@ graph.addEdge({
 - [Versioning Release Note](https://www.yuque.com/antv/x6/bbfu6r)
 - [FAQ](https://www.yuque.com/antv/x6/be9pfx)
 - [CodeSanbox Template](https://codesandbox.io/s/qosj0?file=/src/app.tsx)
+- [awesome-x6](https://github.com/lloydzhou/awesome-x6)
 
 ## Development
 

README.md

@@ -6,18 +6,17 @@
 <p align="center"><strong>提供简单易用的节点定制能力和开箱即用的交互组件，方便我们快速搭建流程图、DAG 图、ER 图等图应用</strong></p>
 
 <p align="center">
-<a href="https://github.com/antvis/X6/actions/workflows/ci.yml"><img alt="build" src="https://img.shields.io/github/actions/workflow/status/antvis/x6/ci.yml?branch=master&logo=github&style=flat-square"></a>
-<!-- <a href="https://app.codecov.io/gh/antvis/X6"><img alt="coverage" src="https://img.shields.io/codecov/c/gh/antvis/x6?logo=codecov&style=flat-square&token=15CO54WYUV"></a> -->
-<a href="https://lgtm.com/projects/g/antvis/x6/context:javascript"><img alt="Language grade: JavaScript" src="https://img.shields.io/lgtm/grade/javascript/g/antvis/x6.svg?logo=lgtm&style=flat-square"></a>
-<a href="https://www.npmjs.com/package/@antv/x6"><img alt="NPM Package" src="https://img.shields.io/npm/v/@antv/x6.svg?style=flat-square"></a>
-<a href="https://www.npmjs.com/package/@antv/x6"><img alt="NPM Downloads" src="https://img.shields.io/npm/dm/@antv/x6?logo=npm&style=flat-square"></a>
+<a href="https://github.com/antvis/X6/actions/workflows/ci.yml"><img alt="build" src="https://img.shields.io/github/actions/workflow/status/antvis/x6/ci.yml?branch=master&style=for-the-badge&logo=github"></a>
+<!-- <a href="https://app.codecov.io/gh/antvis/X6"><img alt="coverage" src="https://img.shields.io/codecov/c/gh/antvis/x6?logo=codecov&style=for-the-badge&token=15CO54WYUV"></a> -->
+<a href="https://www.npmjs.com/package/@antv/x6"><img alt="NPM Package" src="https://img.shields.io/npm/v/@antv/x6.svg?logo=npm&style=for-the-badge"></a>
+<a href="https://www.npmjs.com/package/@antv/x6"><img alt="NPM Downloads" src="https://img.shields.io/npm/dm/@antv/x6?logo=npm&style=for-the-badge"></a>
 </p>
 
 <p align="center">
-<a href="/LICENSE"><img src="https://img.shields.io/github/license/antvis/x6?style=flat-square" alt="MIT License"></a>
-<a href="https://www.typescriptlang.org"><img alt="Language" src="https://img.shields.io/badge/language-TypeScript-blue.svg?style=flat-square"></a>
-<a href="https://github.com/antvis/x6/pulls"><img alt="PRs Welcome" src="https://img.shields.io/badge/PRs-Welcome-brightgreen.svg?style=flat-square"></a>
-<a href="https://x6.antv.antgroup.com"><img alt="website" src="https://img.shields.io/static/v1?label=&labelColor=505050&message=website&color=0076D6&style=flat-square&logo=google-chrome&logoColor=0076D6"></a>
+<a href="/LICENSE"><img src="https://img.shields.io/github/license/antvis/x6?style=for-the-badge" alt="MIT License"></a>
+<a href="https://www.typescriptlang.org"><img alt="Language" src="https://img.shields.io/badge/language-TypeScript-blue.svg?style=for-the-badge"></a>
+<a href="https://github.com/antvis/x6/pulls"><img alt="PRs Welcome" src="https://img.shields.io/badge/PRs-Welcome-brightgreen.svg?style=for-the-badge"></a>
+<a href="https://x6.antv.antgroup.com"><img alt="website" src="https://img.shields.io/static/v1?label=&labelColor=505050&message=website&color=0076D6&style=for-the-badge&logo=google-chrome&logoColor=f5f5f5"></a>
 </p>
 
 ## 特性
@@ -90,6 +89,7 @@ graph.addEdge({
 - [更新日志](https://www.yuque.com/antv/x6/bbfu6r)
 - [常见问题](https://www.yuque.com/antv/x6/tox1ukbz5cw57qfy)
 - [CodeSanbox 模板](https://codesandbox.io/s/mo-ban-wchooy?file=/src/App.tsx)
+- [awesome-x6](https://github.com/lloydzhou/awesome-x6)
 
 ## 本地开发
 

examples/x6-example-features/CHANGELOG.md

@@ -1,3 +1,24 @@
+## @antv/x6-example-features [2.1.1](https://github.com/antvis/X6/compare/@antv/x6-example-features@2.1.0...@antv/x6-example-features@2.1.1) (2023-02-18)
+
+
+### Bug Fixes
+
+* mindmap demo duplicate node id, close [#3256](https://github.com/antvis/X6/issues/3256) ([#3257](https://github.com/antvis/X6/issues/3257)) ([c510756](https://github.com/antvis/X6/commit/c510756fe4e96c8e7471c2fb558e6019ec69b057))
+
+# @antv/x6-example-features [2.1.0](https://github.com/antvis/X6/compare/@antv/x6-example-features@2.0.3...@antv/x6-example-features@2.1.0) (2023-02-17)
+
+
+### Features
+
+* history add max stack size ([#3253](https://github.com/antvis/X6/issues/3253)) ([fba5310](https://github.com/antvis/X6/commit/fba531064ad8027c451a81b60d5efd7f7314a0fa))
+
+## @antv/x6-example-features [2.0.2](https://github.com/antvis/X6/compare/@antv/x6-example-features@2.0.1...@antv/x6-example-features@2.0.2) (2023-01-17)
+
+
+### Bug Fixes
+
+* **mindmap demo:** can not find target id when create edge ([#3144](https://github.com/antvis/X6/issues/3144)) ([bfc8d7f](https://github.com/antvis/X6/commit/bfc8d7f17ac900f70b696c1fa7a3f3f3a389103f))
+
 ## @antv/x6-example-features [2.0.1](https://github.com/antvis/X6/compare/@antv/x6-example-features@2.0.0...@antv/x6-example-features@2.0.1) (2022-12-16)
 
 

examples/x6-example-features/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@antv/x6-example-features",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "scripts": {
     "start": "umi dev",
     "build": "umi build",

examples/x6-example-features/src/pages/case/mind.tsx

@@ -212,12 +212,15 @@ export default class Example extends React.Component {
           return 'right'
         },
       })
-      const cells: Cell[] = []
       const traverse = (hierarchyItem: HierarchyResult) => {
         if (hierarchyItem) {
           const { data, children } = hierarchyItem
-          cells.push(
-            graph.createNode({
+          // 检查当前遍历的节点已经存在还是需要新添加？
+          if (graph.hasCell(data.id)) {
+            const node = graph.getCellById(data.id)
+            node.prop('position', { x: hierarchyItem.x, y: hierarchyItem.y })
+          } else {
+            const node = graph.addNode({
               id: data.id,
               shape: data.type === 'topic-child' ? 'topic-child' : 'topic',
               x: hierarchyItem.x,
@@ -226,13 +229,18 @@ export default class Example extends React.Component {
               height: data.height,
               label: data.label,
               type: data.type,
-            }),
-          )
+            })
+          }
           if (children) {
             children.forEach((item: HierarchyResult) => {
               const { id, data } = item
-              cells.push(
-                graph.createEdge({
+              // 先遍历子节点（里面包含创建逻辑，如果画布没有开启async的时候，创建边会提示找不到target节点）
+              traverse(item)
+              const eid = `${hierarchyItem.id}-->${id}`
+              // 检查当前边是否已经存在
+              if (!graph.hasCell(eid)) {
+                graph.addEdge({
+                  id: eid,
                   shape: 'mindmap-edge',
                   source: {
                     cell: hierarchyItem.id,
@@ -257,15 +265,13 @@ export default class Example extends React.Component {
                       name: 'left',
                     },
                   },
-                }),
-              )
-              traverse(item)
+                })
+              }
             })
           }
         }
       }
       traverse(result)
-      graph.resetCells(cells)
       graph.centerContent()
     }
 
@@ -303,9 +309,14 @@ export default class Example extends React.Component {
       if (dataItem) {
         let item: MindMapData | null = null
         const length = dataItem.children ? dataItem.children.length : 0
+        let nid = `${id}-${length + 1}`
+        if (graph.hasCell(nid)) {
+          // 如果通过length + 1拼接出来的节点id在画布中存在了，就在id后面加上随机数
+          nid = nid + Math.random()
+        }
         if (type === 'topic') {
           item = {
-            id: `${id}-${length + 1}`,
+            id: nid,
             type: 'topic-branch',
             label: `分支主题${length + 1}`,
             width: 100,
@@ -313,7 +324,7 @@ export default class Example extends React.Component {
           }
         } else if (type === 'topic-branch') {
           item = {
-            id: `${id}-${length + 1}`,
+            id: nid,
             type: 'topic-child',
             label: `子主题${length + 1}`,
             width: 60,
@@ -334,10 +345,16 @@ export default class Example extends React.Component {
 
     const removeNode = (id: string) => {
       const res = findItem(data, id)
-      const dataItem = res?.parent
-      if (dataItem && dataItem.children) {
-        const { children } = dataItem
+      const parentItem = res?.parent
+      const nodeItem = res?.node
+      if (parentItem && parentItem.children) {
+        const { children } = parentItem
         const index = children.findIndex((item) => item.id === id)
+        // 删除的时候，先删节点以及可能存在的子节点，再调用render，对data数据进行遍历
+        if (nodeItem && nodeItem.children) {
+          nodeItem.children.forEach((item) => graph.removeCell(item.id))
+        }
+        graph.removeCell(id)
         return children.splice(index, 1)
       }
       return null

examples/x6-example-features/src/pages/history/index.tsx

@@ -0,0 +1,104 @@
+import React from 'react'
+import { Graph } from '@antv/x6'
+import { Keyboard } from '@antv/x6-plugin-keyboard'
+import { Selection } from '@antv/x6-plugin-selection'
+import { History } from '@antv/x6-plugin-history'
+import '../index.less'
+
+export default class Example extends React.Component<
+  {},
+  { graph: Graph | undefined }
+> {
+  private container: HTMLDivElement
+
+  componentDidMount() {
+    const graph = new Graph({
+      container: this.container,
+      width: 800,
+      height: 600,
+      grid: true,
+    })
+
+    this.setState({ graph })
+
+    const selection = new Selection({ enabled: true })
+    const keyboard = new Keyboard({ enabled: true })
+    const history = new History({ enabled: true, stackSize: 5 })
+
+    graph.use(selection)
+    graph.use(keyboard)
+    graph.use(history)
+
+    graph.addNode({
+      x: 50,
+      y: 50,
+      width: 100,
+      height: 40,
+      attrs: { label: { text: 'A' } },
+    })
+
+    graph.addNode({
+      x: 250,
+      y: 50,
+      width: 100,
+      height: 40,
+      attrs: { label: { text: 'B' } },
+    })
+
+    graph.addNode({
+      x: 350,
+      y: 150,
+      width: 100,
+      height: 40,
+      attrs: { label: { text: 'C' } },
+    })
+
+    keyboard.bindKey('backspace', () => {
+      graph.removeCells(selection.getSelectedCells())
+    })
+    keyboard.bindKey('command+z', () => {
+      this.undo()
+    })
+    keyboard.bindKey('command+shift+z', () => {
+      this.redo()
+    })
+  }
+
+  refContainer = (container: HTMLDivElement) => {
+    this.container = container
+  }
+
+  enablePlugins = () => {
+    const { graph } = this.state
+    graph?.enablePlugins('keyboard')
+  }
+
+  disablePlugins = () => {
+    const { graph } = this.state
+    graph?.disablePlugins('keyboard')
+  }
+
+  undo = () => {
+    const { graph } = this.state
+    const history = graph?.getPlugin('history') as History
+    history?.undo()
+  }
+
+  redo = () => {
+    const { graph } = this.state
+    const history = graph?.getPlugin('history') as History
+    history?.redo()
+  }
+
+  render() {
+    return (
+      <div className="x6-graph-wrap">
+        <div ref={this.refContainer} className="x6-graph" />
+        <button onClick={this.enablePlugins}>enable</button>
+        <button onClick={this.disablePlugins}>disable</button>
+        <button onClick={this.undo}>undo</button>
+        <button onClick={this.redo}>redo</button>
+      </div>
+    )
+  }
+}

examples/x6-example-features/src/pages/index.tsx

@@ -179,6 +179,10 @@ const dataSource = [
     example: 'animation/transition',
     description: '动画',
   },
+  {
+    example: 'history',
+    description: '时光回溯',
+  },
 ].map((item, index) => ({ key: index, ...item }))
 
 const columns = [

examples/x6-example-features/src/pages/keyboard/index.tsx

@@ -4,7 +4,10 @@ import { Keyboard } from '@antv/x6-plugin-keyboard'
 import { Selection } from '@antv/x6-plugin-selection'
 import '../index.less'
 
-export default class Example extends React.Component {
+export default class Example extends React.Component<
+  {},
+  { graph: Graph | undefined }
+> {
   private container: HTMLDivElement
 
   componentDidMount() {
@@ -15,6 +18,8 @@ export default class Example extends React.Component {
       grid: true,
     })
 
+    this.setState({ graph })
+
     const selection = new Selection({ enabled: true })
     const keyboard = new Keyboard({ enabled: true })
     graph.use(selection)
@@ -53,10 +58,22 @@ export default class Example extends React.Component {
     this.container = container
   }
 
+  enablePlugins = () => {
+    const { graph } = this.state
+    graph.enablePlugins('keyboard')
+  }
+
+  disablePlugins = () => {
+    const { graph } = this.state
+    graph.disablePlugins('keyboard')
+  }
+
   render() {
     return (
       <div className="x6-graph-wrap">
         <div ref={this.refContainer} className="x6-graph" />
+        <button onClick={this.enablePlugins}>enable</button>
+        <button onClick={this.disablePlugins}>disable</button>
       </div>
     )
   }

package.json

@@ -2,7 +2,7 @@
   "name": "x6",
   "private": true,
   "scripts": {
-    "preinstall": "node ./scripts/preinstall",
+    "preinstall": "npx only-allow pnpm",
     "lint:ts": "eslint '**/src/**/*.{js,ts}?(x)' --cache --fix",
     "lint:style": "stylelint '**/src/**/*.less' --customSyntax postcss-less --cache --fix",
     "lint": "run-s lint:ts lint:style",
@@ -51,7 +51,7 @@
       "prettier --write --ignore-unknown"
     ],
     "*.less": [
-      "stylelint --syntax less --fix"
+      "stylelint --customSyntax postcss-less --fix"
     ],
     "*.js": [
       "prettier --write"
@@ -163,5 +163,8 @@
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.2.0"
+  },
+  "engines": {
+    "pnpm": ">=7"
   }
 }

packages/x6-angular-shape/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021-2023 Alipay.inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

packages/x6-angular-shape/README.md

@@ -0,0 +1,136 @@
+# @antv/x6-angular-shape
+
+## 渲染节点
+
+我们提供了一个独立的包 `@antv/x6-angular-shape` 以支持将 Angular 的组件/模板作为节点进行渲染。
+
+### Component 渲染
+
+```ts
+@Component({
+  selector: 'app-node',
+  templateUrl: './node.component.html',
+  styleUrls: ['./node.component.scss'],
+})
+export class NodeComponent implements AfterViewInit, OnChanges {
+  @Input() value: string;
+}
+```
+
+```ts
+import { register } from "@antv/x6-angular-shape";
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+})
+export class AppComponent implements AfterViewInit {
+  ngAfterViewInit(): void {
+    register({
+      shape: 'custom-angular-component-node',
+      width: 120,
+      height: 20,
+      content: NodeComponent,
+      injector: this.injector,
+    });
+
+    this.graph.addNode({
+      shape: 'custom-angular-component-node',
+      x: 100,
+      y: 100,
+      data: {
+        // Input 的参数必须放在这里
+        ngArguments: {
+          value: '糟糕糟糕 Oh my god',
+        },
+      },
+    });
+  }
+}
+
+```
+
+### TemplateRef 渲染
+
+```html
+<ng-template #template let-data="ngArguments">
+  <section class="template-container">
+    <span class="value">{{ data.value }}</span>
+  </section>
+</ng-template>
+```
+
+```ts
+import { register } from "@antv/x6-angular-shape";
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+})
+export class AppComponent implements AfterViewInit {
+  @ViewChild('template') template: TemplateRef<{}>;
+
+  ngAfterViewInit(): void {
+    register({
+      shape: 'custom-angular-template-node',
+      width: 120,
+      height: 20,
+      content: this.template,
+      injector: this.injector,
+    });
+
+    this.graph.addNode({
+      shape: 'custom-angular-template-node',
+      x: 100,
+      y: 100,
+      data: {
+        ngArguments: {
+          value: '魔法怎么失灵啦',
+        },
+      },
+    });
+  }
+}
+
+```
+
+## 更新节点
+
+无论是使用 Component 还是 TemplateRef, 都是一样的更新方式.
+```ts
+node.setData({
+  ngArguments: {
+    value: '晚风中闪过 几帧从前啊',
+  },
+});
+```
+
+## 有 demo 吗?
+
+有的, 因为X6渲染节点部分与框架是解耦的. 因此 `x6-angular-shape` 包并非是直接在源代码里改的, 而是在一个单独的Angular环境中开发的. 该 demo 还提供了多种节点类型的性能测试, 详情请参考[Eve-Sama/x6-angular-shape](https://github.com/Eve-Sama/x6-angular-shape)、[X6与G6的性能对比, 以及X6多节点类型下的FPS临界点讨论](https://github.com/antvis/X6/issues/3266)
+
+## FAQ
+
+### 为什么输入属性不能直接放在 data 中而需要放在 ngArguments 中? 且为什么不叫 ngInput?
+
+因为并非所有 `node.data` 中的属性都是输入属性, 所以遍历 `data` 中的所有属性进行赋值是不合适的. 至于为什么叫 `ngArguments` 主要是有两点考虑.
+ - 1.x版本中已经这么用了, 沿用该API可以降低用户升级成本
+ - `Input` 的概念其实是来自 `Component`, 而 `TemplateRef` 中是 `context`, 在二者的基础上抽象一个 `Arguments` 的概念更通用些
+
+### 2.x版本的 x6-angular-shape 相比较1.x版本有什么新特性吗?
+
+实现思路其实和之前是差不多的. 但是确实有几个点值得一提.
+
+#### demo更聚焦
+
+1.x版本的 demo 除了渲染组件外, 还写了连线、清除等一系列案例. 看似扩展, 实则眼花缭乱. 作为 `x6-angular-shape`的 demo, 2.x版本更加聚焦, 更加聚焦于shape的使用与性能测试等, 与插件无关的内容请查看X6官网.
+
+#### 功能更稳定
+
+在1.x版本中, 虽然实现了功能, 但是使用场景的思考不够全面. 比如`ngArguments`的变化, 对 `TemplateRef`的场景并不生效. 虽然对`Component`生效但是无法触发`ngOnChanges`. 而在新版本中, 这些问题都将不复存在.
+
+### 版本要求
+
+你的Angular版本至少在14及以上才可以. 14以下需要用 hack 的方式实现一些特性, 比较麻烦. 暂时不提供, 如有需要可提issue, 我再专门介绍下如何实现.

packages/x6-angular-shape/package.json

@@ -0,0 +1,65 @@
+{
+  "name": "@antv/x6-angular-shape",
+  "version": "2.0.0",
+  "description": "X6 shape for rendering angular components.",
+  "main": "lib/index.js",
+  "module": "es/index.js",
+  "unpkg": "dist/index.js",
+  "jsdelivr": "dist/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "dist",
+    "es",
+    "lib"
+  ],
+  "keywords": [
+    "shape",
+    "angular",
+    "render",
+    "x6",
+    "antv"
+  ],
+  "scripts": {
+    "clean:turbo": "rss",
+    "clean:build": "rss",
+    "clean:coverage": "rss",
+    "clean": "rss",
+    "build:esm": "rss",
+    "build:cjs": "rss",
+    "build:umd": "rss",
+    "build:dev": "rss",
+    "build:watch": "rss",
+    "build:watch:esm": "rss",
+    "build:watch:cjs": "rss",
+    "build": "rss",
+    "prebuild": "rss",
+    "test": "rss",
+    "coveralls": "rss",
+    "pretest": "rss"
+  },
+  "peerDependencies": {
+    "@antv/x6": "^2.x",
+    "@angular/core": ">= 14"
+  },
+  "devDependencies": {
+    "@antv/x6": "^2.x"
+  },
+  "author": {
+    "name": "Eve-Sama",
+    "email": "948832626@qq.com"
+  },
+  "license": "MIT",
+  "homepage": "https://x6.antv.antgroup.com/tutorial/intermediate/angular",
+  "bugs": {
+    "url": "https://github.com/antvis/x6/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/antvis/x6.git",
+    "directory": "packages/x6-angular-shape"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  }
+}

packages/x6-angular-shape/src/index.ts

@@ -0,0 +1,3 @@
+export * from './node'
+export * from './view'
+export * from './registry'

packages/x6-angular-shape/src/node.ts

@@ -0,0 +1,102 @@
+import { Node, Markup, ObjectExt } from '@antv/x6'
+
+export class AngularShape<
+  Properties extends AngularShape.Properties = AngularShape.Properties,
+> extends Node<Properties> {}
+
+export namespace AngularShape {
+  export type Primer =
+    | 'rect'
+    | 'circle'
+    | 'path'
+    | 'ellipse'
+    | 'polygon'
+    | 'polyline'
+
+  export interface Properties extends Node.Properties {
+    primer?: Primer
+  }
+}
+
+export namespace AngularShape {
+  function getMarkup(primer?: Primer) {
+    const markup: Markup.JSONMarkup[] = []
+    const content = Markup.getForeignObjectMarkup()
+
+    if (primer) {
+      markup.push(
+        ...[
+          {
+            tagName: primer,
+            selector: 'body',
+          },
+          content,
+        ],
+      )
+    } else {
+      markup.push(content)
+    }
+
+    return markup
+  }
+
+  AngularShape.config<Properties>({
+    view: 'angular-shape-view',
+    markup: getMarkup(),
+    attrs: {
+      body: {
+        fill: 'none',
+        stroke: 'none',
+        refWidth: '100%',
+        refHeight: '100%',
+      },
+      fo: {
+        refWidth: '100%',
+        refHeight: '100%',
+      },
+    },
+    propHooks(metadata: Properties) {
+      if (metadata.markup == null) {
+        const primer = metadata.primer
+        if (primer) {
+          metadata.markup = getMarkup(primer)
+
+          let attrs = {}
+          switch (primer) {
+            case 'circle':
+              attrs = {
+                refCx: '50%',
+                refCy: '50%',
+                refR: '50%',
+              }
+              break
+            case 'ellipse':
+              attrs = {
+                refCx: '50%',
+                refCy: '50%',
+                refRx: '50%',
+                refRy: '50%',
+              }
+              break
+            default:
+              break
+          }
+          metadata.attrs = ObjectExt.merge(
+            {},
+            {
+              body: {
+                refWidth: null,
+                refHeight: null,
+                ...attrs,
+              },
+            },
+            metadata.attrs || {},
+          )
+        }
+      }
+      return metadata
+    },
+  })
+
+  Node.registry.register('angular-shape', AngularShape, true)
+}

packages/x6-angular-shape/src/registry.ts

@@ -0,0 +1,32 @@
+import { Injector, TemplateRef, Type } from '@angular/core'
+import { Graph, Node } from '@antv/x6'
+
+export type Content = TemplateRef<any> | Type<any>
+
+export type AngularShapeConfig = Node.Properties & {
+  shape: string
+  injector: Injector
+  content: Content
+}
+
+export const registerInfo: Map<
+  string,
+  {
+    injector: Injector
+    content: Content
+  }
+> = new Map()
+
+export function register(config: AngularShapeConfig) {
+  const { shape, injector, content, ...others } = config
+  registerInfo.set(shape, { injector, content })
+
+  Graph.registerNode(
+    shape,
+    {
+      inherit: 'angular-shape',
+      ...others,
+    },
+    true,
+  )
+}

packages/x6-angular-shape/src/view.ts

@@ -0,0 +1,124 @@
+import {
+  ComponentRef,
+  EmbeddedViewRef,
+  TemplateRef,
+  ViewContainerRef,
+} from '@angular/core'
+import { Dom, NodeView } from '@antv/x6'
+import { AngularShape } from './node'
+import { Content, registerInfo } from './registry'
+
+export class AngularShapeView extends NodeView<AngularShape> {
+  getNodeContainer(): HTMLDivElement {
+    return this.selectors && (this.selectors.foContent as HTMLDivElement)
+  }
+
+  override confirmUpdate(flag: number): number {
+    const ret = super.confirmUpdate(flag)
+    return this.handleAction(ret, AngularShapeView.action, () =>
+      this.renderAngularContent(),
+    )
+  }
+
+  private getNgArguments(): Record<string, any> {
+    const input = (this.cell.data?.ngArguments as Record<string, any>) || {}
+    return input
+  }
+
+  /** 当执行 node.setData() 时需要对实例设置新的输入值 */
+  private setInstanceInput(
+    content: Content,
+    ref: EmbeddedViewRef<any> | ComponentRef<any>,
+  ): void {
+    const ngArguments = this.getNgArguments()
+    if (content instanceof TemplateRef) {
+      const embeddedViewRef = ref as EmbeddedViewRef<any>
+      embeddedViewRef.context = { ngArguments }
+    } else {
+      const componentRef = ref as ComponentRef<any>
+      Object.keys(ngArguments).forEach((v) =>
+        componentRef.setInput(v, ngArguments[v]),
+      )
+      componentRef.changeDetectorRef.detectChanges()
+    }
+  }
+
+  protected renderAngularContent(): void {
+    this.unmountAngularContent()
+    const container = this.getNodeContainer()
+    if (container) {
+      const node = this.cell
+      const { injector, content } = registerInfo.get(node.shape)!
+      const viewContainerRef = injector.get(ViewContainerRef)
+      if (content instanceof TemplateRef) {
+        const ngArguments = this.getNgArguments()
+        const embeddedViewRef = viewContainerRef.createEmbeddedView(content, {
+          ngArguments,
+        })
+        embeddedViewRef.rootNodes.forEach((node) => container.appendChild(node))
+        embeddedViewRef.detectChanges()
+        node.on('change:data', () =>
+          this.setInstanceInput(content, embeddedViewRef),
+        )
+      } else {
+        const componentRef = viewContainerRef.createComponent(content)
+        const insertNode = (componentRef.hostView as EmbeddedViewRef<any>)
+          .rootNodes[0] as HTMLElement
+        container.appendChild(insertNode)
+        this.setInstanceInput(content, componentRef)
+        node.on('change:data', () =>
+          this.setInstanceInput(content, componentRef),
+        )
+      }
+    }
+  }
+
+  protected unmountAngularContent(): HTMLDivElement {
+    const container = this.getNodeContainer()
+    container.innerHTML = ''
+    return container
+  }
+
+  override onMouseDown(e: Dom.MouseDownEvent, x: number, y: number) {
+    const target = e.target as Element
+    const tagName = target.tagName.toLowerCase()
+    if (tagName === 'input') {
+      const type = target.getAttribute('type')
+      if (
+        type == null ||
+        [
+          'text',
+          'password',
+          'number',
+          'email',
+          'search',
+          'tel',
+          'url',
+        ].includes(type)
+      ) {
+        return
+      }
+    }
+
+    super.onMouseDown(e, x, y)
+  }
+
+  override unmount(): this {
+    this.unmountAngularContent()
+    super.unmount()
+    return this
+  }
+}
+
+export namespace AngularShapeView {
+  export const action = 'angular' as any
+
+  AngularShapeView.config({
+    bootstrap: [action],
+    actions: {
+      component: action,
+    },
+  })
+
+  NodeView.registry.register('angular-shape-view', AngularShapeView, true)
+}

packages/x6-angular-shape/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}

packages/x6-common/CHANGELOG.md

@@ -1,3 +1,31 @@
+## @antv/x6-common [2.0.10](https://github.com/antvis/x6/compare/@antv/x6-common@2.0.9...@antv/x6-common@2.0.10) (2023-02-24)
+
+
+### Bug Fixes
+
+* add textLength & lengthAdjust to CASE_SENSITIVE_ATTR ([#3281](https://github.com/antvis/x6/issues/3281)) ([76fb1ac](https://github.com/antvis/x6/commit/76fb1acf74b0f1c308f7c824d02c12244b7ac8f3))
+
+## @antv/x6-common [2.0.8](https://github.com/antvis/x6/compare/@antv/x6-common@2.0.7...@antv/x6-common@2.0.8) (2023-02-18)
+
+
+### Bug Fixes
+
+* fix typo for dom event handlers ([#3255](https://github.com/antvis/x6/issues/3255)) ([9b4fa86](https://github.com/antvis/x6/commit/9b4fa86daa587fe8818f3615bc1e40738a0f2319))
+
+## @antv/x6-common [2.0.6](https://github.com/antvis/x6/compare/@antv/x6-common@2.0.5...@antv/x6-common@2.0.6) (2023-01-31)
+
+
+### Bug Fixes
+
+* fix index error for priorityQueue ([#3179](https://github.com/antvis/x6/issues/3179)) ([d64150b](https://github.com/antvis/x6/commit/d64150bfadf10fe21f44734a0267261260b8c53b))
+
+## @antv/x6-common [2.0.5](https://github.com/antvis/x6/compare/@antv/x6-common@2.0.4...@antv/x6-common@2.0.5) (2023-01-18)
+
+
+### Bug Fixes
+
+* optimize css loader ([#3156](https://github.com/antvis/x6/issues/3156)) ([9c48ad8](https://github.com/antvis/x6/commit/9c48ad8dfc99e623a57855295d07c35be5483073))
+
 ## @antv/x6-common [2.0.4](https://github.com/antvis/x6/compare/@antv/x6-common@2.0.3...@antv/x6-common@2.0.4) (2022-12-20)
 
 

packages/x6-common/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-common",
-  "version": "2.0.4",
+  "version": "2.0.10",
   "description": "Basic toolkit for X6",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-common/src/algorithm/priorityqueue.ts

@@ -45,7 +45,7 @@ export class PriorityQueue<T> {
    */
   insert(priority: number, value: T, id?: string) {
     const item: PriorityQueue.DataItem<T> = { priority, value }
-    const index = this.data.length - 1
+    const index = this.data.length
     if (id) {
       item.id = id
       this.index[id] = index
@@ -96,7 +96,9 @@ export class PriorityQueue<T> {
     const data = this.data
     const peek = data[0]
     const last = data.pop()!
-    delete this.index[data.length]
+    if (peek.id) {
+      delete this.index[peek.id]
+    }
 
     if (data.length > 0) {
       data[0] = last

packages/x6-common/src/css-loader/loader.ts

@@ -2,6 +2,7 @@ import { Platform } from '../platform'
 
 interface CssModule {
   name: string
+  loadTimes: number
   styleElement: HTMLStyleElement | null
 }
 
@@ -10,7 +11,10 @@ const cssModules: CssModule[] = []
 export function ensure(name: string, content: string) {
   const cssModule = cssModules.find((m) => m.name === name)
   if (cssModule) {
-    return
+    cssModule.loadTimes += 1
+    if (cssModule.loadTimes > 1) {
+      return
+    }
   }
 
   if (!Platform.isApplyingHMR()) {
@@ -25,6 +29,7 @@ export function ensure(name: string, content: string) {
 
     cssModules.push({
       name,
+      loadTimes: 1,
       styleElement,
     })
   }
@@ -34,7 +39,13 @@ export function clean(name: string) {
   const index = cssModules.findIndex((m) => m.name === name)
 
   if (index > -1) {
-    let styleElement = cssModules[index].styleElement
+    const cssModule = cssModules[index]
+    cssModule.loadTimes -= 1
+    if (cssModule.loadTimes > 0) {
+      return
+    }
+
+    let styleElement = cssModule.styleElement
     if (styleElement && styleElement.parentNode) {
       styleElement.parentNode.removeChild(styleElement)
     }

packages/x6-common/src/dom/attr.ts

@@ -6,6 +6,8 @@ export const CASE_SENSITIVE_ATTR = [
   'attributeName',
   'attributeType',
   'repeatCount',
+  'textLength',
+  'lengthAdjust',
 ]
 
 export type Attributes = { [key: string]: string | number | null | undefined }

packages/x6-common/src/dom/event/types.ts

@@ -729,7 +729,7 @@ type TypeEventHandlersBase<TDelegateTarget, TData, TCurrentTarget, TTarget> = {
     TCurrentTarget,
     TTarget
   >]?:
-    | TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, TType>
+    | TypeEventHandler<TDelegateTarget, TData, TCurrentTarget, TTarget, string>
     | false
     | Record<string, unknown>
 }

packages/x6-common/src/dom/text.ts

@@ -198,7 +198,14 @@ export function text(
   const autoLineHeight = defaultLineHeight === 'auto'
   const lineHeight = autoLineHeight ? '1.5em' : defaultLineHeight || '1em'
 
-  empty(elem)
+  let needEmptyElem = true
+  const childs = elem.children
+  if (childs.length === 1 && childs[0].tagName.toUpperCase() === 'TITLE') {
+    needEmptyElem = false
+  }
+  if (needEmptyElem) {
+    empty(elem)
+  }
 
   attr(elem, {
     // Preserve spaces, do not consecutive spaces to get collapsed to one.

packages/x6-common/src/function/function.ts

@@ -1,4 +1,4 @@
-export { debounce } from 'lodash-es'
+export { debounce, throttle } from 'lodash-es'
 
 type Fn = (...args: any[]) => any
 

packages/x6-geometry/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-clipboard/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-clipboard/src/api.ts

@@ -7,7 +7,7 @@ declare module '@antv/x6/lib/graph/graph' {
     enableClipboard: () => Graph
     disableClipboard: () => Graph
     toggleClipboard: (enabled?: boolean) => Graph
-    isClipboardEmpty: () => boolean
+    isClipboardEmpty: (options?: Clipboard.Options) => boolean
     getCellsInClipboard: () => Cell[]
     cleanClipboard: () => Graph
     copy: (cells: Cell[], options?: Clipboard.CopyOptions) => Graph
@@ -55,10 +55,10 @@ Graph.prototype.toggleClipboard = function (enabled?: boolean) {
   return this
 }
 
-Graph.prototype.isClipboardEmpty = function () {
+Graph.prototype.isClipboardEmpty = function (options?: Clipboard.Options) {
   const clipboard = this.getPlugin('clipboard') as Clipboard
   if (clipboard) {
-    return clipboard.isEmpty()
+    return clipboard.isEmpty(options)
   }
   return true
 }

packages/x6-plugin-clipboard/src/clipboard.ts

@@ -89,7 +89,12 @@ export class ClipboardImpl {
     }
   }
 
-  isEmpty() {
+  isEmpty(options: ClipboardImpl.Options = {}) {
+    if (options.useLocalStorage) {
+      // With useLocalStorage turned on, no real cells can be obtained without deserialize first
+      // https://github.com/antvis/X6/issues/2573
+      this.deserialize(options)
+    }
     return this.cells.length <= 0
   }
 

packages/x6-plugin-clipboard/src/index.ts

@@ -11,7 +11,7 @@ export class Clipboard
   public options: Clipboard.Options
   public name = 'clipboard'
 
-  constructor(options: Clipboard.Options) {
+  constructor(options: Clipboard.Options = { enabled: true }) {
     super()
     this.options = options
   }
@@ -32,14 +32,12 @@ export class Clipboard
     if (this.disabled) {
       this.options.enabled = true
     }
-    return this
   }
 
   disable() {
     if (!this.disabled) {
       this.options.enabled = false
     }
-    return this
   }
 
   toggleEnabled(enabled?: boolean) {
@@ -60,8 +58,8 @@ export class Clipboard
     return this
   }
 
-  isEmpty() {
-    return this.clipboardImpl.isEmpty()
+  isEmpty(options: Clipboard.Options = {}) {
+    return this.clipboardImpl.isEmpty(options)
   }
 
   getCellsInClipboard() {

packages/x6-plugin-dnd/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @antv/x6-plugin-dnd [2.0.4](https://github.com/antvis/x6/compare/@antv/x6-plugin-dnd@2.0.3...@antv/x6-plugin-dnd@2.0.4) (2023-01-13)
+
+
+### Bug Fixes
+
+* change dragging container options ([#3139](https://github.com/antvis/x6/issues/3139)) ([7b091f3](https://github.com/antvis/x6/commit/7b091f35dee147c5e7bf97577e14e11ceb7e8e3d))
+
 ## @antv/x6-plugin-dnd [2.0.3](https://github.com/antvis/x6/compare/@antv/x6-plugin-dnd@2.0.2...@antv/x6-plugin-dnd@2.0.3) (2022-11-25)
 
 

packages/x6-plugin-dnd/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-dnd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-plugin-dnd",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "dnd plugin for X6",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-plugin-dnd/src/index.ts

@@ -81,7 +81,10 @@ export class Dnd extends View {
 
     this.targetModel.startBatch('dnd')
     Dom.addClass(this.container, 'dragging')
-    Dom.appendTo(this.container, this.options.containerParent || document.body)
+    Dom.appendTo(
+      this.container,
+      this.options.draggingContainer || document.body,
+    )
 
     this.sourceNode = node
     this.prepareDragging(node, e.clientX, e.clientY)
@@ -481,7 +484,7 @@ export namespace Dnd {
     //       duration?: number
     //       easing?: string
     //     }
-    containerParent?: HTMLElement
+    draggingContainer?: HTMLElement
     /**
      * dnd tool box container.
      */

packages/x6-plugin-export/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-history/CHANGELOG.md

@@ -1,3 +1,10 @@
+# @antv/x6-plugin-history [2.2.0](https://github.com/antvis/x6/compare/@antv/x6-plugin-history@2.1.3...@antv/x6-plugin-history@2.2.0) (2023-02-17)
+
+
+### Features
+
+* history add max stack size ([#3253](https://github.com/antvis/x6/issues/3253)) ([fba5310](https://github.com/antvis/x6/commit/fba531064ad8027c451a81b60d5efd7f7314a0fa))
+
 ## @antv/x6-plugin-history [2.1.3](https://github.com/antvis/x6/compare/@antv/x6-plugin-history@2.1.2...@antv/x6-plugin-history@2.1.3) (2022-11-25)
 
 

packages/x6-plugin-history/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-history/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-plugin-history",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "description": "history plugin for X6",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-plugin-history/src/index.ts

@@ -25,6 +25,7 @@ export class History
   protected batchLevel = 0
   protected lastBatchIndex = -1
   protected freezed = false
+  protected stackSize = 0 // 0: not limit
 
   protected readonly handlers: (<T extends History.ModelEvents>(
     event: T,
@@ -33,6 +34,8 @@ export class History
 
   constructor(options: History.Options) {
     super()
+    const { stackSize = 0 } = options
+    this.stackSize = stackSize
     this.options = Util.getOptions(options)
     this.validator = new History.Validator({
       history: this,
@@ -101,7 +104,7 @@ export class History
       const cmd = this.redoStack.pop()
       if (cmd) {
         this.applyCommand(cmd, options)
-        this.undoStack.push(cmd)
+        this.undoStackPush(cmd)
         this.notify('redo', cmd, options)
       }
     }
@@ -424,7 +427,7 @@ export class History
       const cmds = this.filterBatchCommand(this.batchCommands)
       if (cmds.length > 0) {
         this.redoStack = []
-        this.undoStack.push(cmds)
+        this.undoStackPush(cmds)
         this.consolidateCommands()
         this.notify('add', cmds, options)
       }
@@ -498,7 +501,7 @@ export class History
       this.lastBatchIndex = Math.max(this.lastBatchIndex, 0)
       this.emit('batch', { cmd, options })
     } else {
-      this.undoStack.push(cmd)
+      this.undoStackPush(cmd)
       this.consolidateCommands()
       this.notify('add', cmd, options)
     }
@@ -560,6 +563,17 @@ export class History
     this.undoStack.pop()
   }
 
+  protected undoStackPush(cmd: History.Commands) {
+    if (this.stackSize === 0) {
+      this.undoStack.push(cmd)
+      return
+    }
+    if (this.undoStack.length >= this.stackSize) {
+      this.undoStack.shift()
+    }
+    this.undoStack.push(cmd)
+  }
+
   @Basecoat.dispose()
   dispose() {
     this.validator.dispose()
@@ -614,7 +628,9 @@ export namespace History {
     cancelInvalid?: boolean
   }
 
-  export interface Options extends Partial<CommonOptions> {}
+  export interface Options extends Partial<CommonOptions> {
+    stackSize?: number
+  }
 
   interface Data {
     id?: string

packages/x6-plugin-keyboard/CHANGELOG.md

@@ -1,3 +1,10 @@
+# @antv/x6-plugin-keyboard [2.2.0](https://github.com/antvis/x6/compare/@antv/x6-plugin-keyboard@2.1.4...@antv/x6-plugin-keyboard@2.2.0) (2023-02-06)
+
+
+### Features
+
+* keyboard support clear and custom trigger ([#3202](https://github.com/antvis/x6/issues/3202)) ([668c932](https://github.com/antvis/x6/commit/668c93242fbcebb987cccc3dcfd56982f7c66252))
+
 ## @antv/x6-plugin-keyboard [2.1.4](https://github.com/antvis/x6/compare/@antv/x6-plugin-keyboard@2.1.3...@antv/x6-plugin-keyboard@2.1.4) (2022-11-29)
 
 

packages/x6-plugin-keyboard/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-keyboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-plugin-keyboard",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "keyboard plugin for X6",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-plugin-keyboard/src/api.ts

@@ -14,6 +14,8 @@ declare module '@antv/x6/lib/graph/graph' {
       action?: KeyboardImpl.Action,
     ) => Graph
     unbindKey: (keys: string | string[], action?: KeyboardImpl.Action) => Graph
+    clearKeys: () => Graph
+    triggerKey: (key: string, action: KeyboardImpl.Action) => Graph
   }
 }
 
@@ -71,3 +73,19 @@ Graph.prototype.unbindKey = function (
   }
   return this
 }
+
+Graph.prototype.clearKeys = function() {
+  const keyboard = this.getPlugin('keyboard') as Keyboard
+  if(keyboard) {
+    keyboard.clear()
+  }
+  return this
+}
+
+Graph.prototype.triggerKey = function(key: string, action: KeyboardImpl.Action) {
+  const keyboard = this.getPlugin('keyboard') as Keyboard
+  if(keyboard) {
+    keyboard.trigger(key, action)
+  }
+  return this
+}

packages/x6-plugin-keyboard/src/index.ts

@@ -7,7 +7,7 @@ export class Keyboard extends Disposable {
   public name = 'keyboard'
   public options: KeyboardImpl.Options
 
-  constructor(options: KeyboardImpl.Options) {
+  constructor(options: KeyboardImpl.Options = { enabled: true }) {
     super()
     this.options = options
   }
@@ -27,12 +27,10 @@ export class Keyboard extends Disposable {
 
   enable() {
     this.keyboardImpl.enable()
-    return this
   }
 
   disable() {
     this.keyboardImpl.disable()
-    return this
   }
 
   toggleEnabled(enabled?: boolean) {
@@ -61,6 +59,16 @@ export class Keyboard extends Disposable {
     return this
   }
 
+  trigger(key: string, action?: KeyboardImpl.Action) {
+    this.keyboardImpl.trigger(key, action)
+    return this
+  }
+
+  clear() {
+    this.keyboardImpl.clear()
+    return this
+  }
+
   unbindKey(keys: string | string[], action?: KeyboardImpl.Action) {
     this.keyboardImpl.off(keys, action)
     return this

packages/x6-plugin-keyboard/src/keyboard.ts

@@ -21,7 +21,6 @@ export class KeyboardImpl extends Disposable implements IDisablable {
     private readonly options: KeyboardImpl.Options & { graph: Graph },
   ) {
     super()
-
     const scroller = this.graph.getPlugin('scroller') as any
     this.container = scroller ? scroller.container : this.graph.container
 
@@ -76,6 +75,14 @@ export class KeyboardImpl extends Disposable implements IDisablable {
     this.mousetrap.unbind(this.getKeys(keys), action)
   }
 
+  clear() {
+    this.mousetrap.reset()
+  }
+
+  trigger(key: string, action?: KeyboardImpl.Action) {
+    this.mousetrap.trigger(key, action)
+  }
+
   private focus(e: EventArgs['node:mouseup']) {
     const isInputEvent = this.isInputEvent(e.e)
     if (isInputEvent) {
@@ -95,7 +102,7 @@ export class KeyboardImpl extends Disposable implements IDisablable {
 
   protected formatkey(key: string) {
     const formated = key
-      .toLowerCase()
+      .toLocaleLowerCase()
       .replace(/\s/g, '')
       .replace('delete', 'del')
       .replace('cmd', 'command')

packages/x6-plugin-minimap/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-scroller/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-scroller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-plugin-scroller",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "scroller plugin for X6",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-plugin-scroller/src/index.ts

@@ -35,17 +35,16 @@ export class Scroller extends Basecoat<Scroller.EventArgs> {
     return this.scrollerImpl.container
   }
 
-  constructor(public readonly options: Scroller.Options) {
+  constructor(public options: Scroller.Options) {
     super()
     CssLoader.ensure(this.name, content)
   }
 
   public init(graph: Graph) {
     this.graph = graph
-    this.scrollerImpl = new ScrollerImpl({
-      ...this.options,
-      graph,
-    })
+    const options = ScrollerImpl.getOptions({ ...this.options, graph })
+    this.options = options
+    this.scrollerImpl = new ScrollerImpl(options)
     this.setup()
     this.startListening()
     this.updateClassName()
@@ -401,8 +400,10 @@ export namespace Scroller {
   export interface EventArgs extends ScrollerImpl.EventArgs {}
 
   type EventType = 'leftMouseDown' | 'rightMouseDown'
-  export interface Options extends ScrollerImpl.CommonOptions {
+  interface ScrollerOptions extends ScrollerImpl.Options {
     pannable?: boolean | { enabled: boolean; eventTypes: EventType[] }
     modifiers?: string | ModifierKey[] | null // alt, ctrl, shift, meta
   }
+
+  export type Options = Omit<ScrollerOptions, 'graph'>
 }

packages/x6-plugin-scroller/src/scroller.ts

@@ -1128,7 +1128,8 @@ export namespace ScrollerImpl {
     panning: { e: Dom.MouseMoveEvent }
     'pan:stop': { e: Dom.MouseUpEvent }
   }
-  export interface CommonOptions {
+  export interface Options {
+    graph: Graph
     enabled?: boolean
     className?: string
     width?: number
@@ -1151,10 +1152,6 @@ export namespace ScrollerImpl {
           scroller: ScrollerImpl,
         ) => TransformManager.FitToContentFullOptions)
   }
-
-  export interface Options extends CommonOptions {
-    graph: Graph
-  }
   export interface CenterOptions {
     padding?: NumberExt.SideOptions
   }
@@ -1266,7 +1263,7 @@ export namespace ScrollerImpl {
       result.background == null
     ) {
       result.background = graphOptions.background
-      delete graphOptions.background
+      options.graph.background.clear()
     }
 
     return result as ScrollerImpl.Options

packages/x6-plugin-selection/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-selection/src/index.ts

@@ -36,7 +36,7 @@ export class Selection extends Basecoat<SelectionImpl.EventArgs> {
     return this.selectionImpl.cells
   }
 
-  constructor(options: Selection.Options) {
+  constructor(options: Selection.Options = { enabled: true }) {
     super()
     this.options = ObjectExt.merge({}, Selection.defaultOptions, options)
     CssLoader.ensure(this.name, content)
@@ -62,14 +62,12 @@ export class Selection extends Basecoat<SelectionImpl.EventArgs> {
     if (this.disabled) {
       this.options.enabled = true
     }
-    return this
   }
 
   disable() {
     if (!this.disabled) {
       this.options.enabled = false
     }
-    return this
   }
 
   toggleEnabled(enabled?: boolean) {

packages/x6-plugin-snapline/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-snapline/src/index.ts

@@ -8,7 +8,7 @@ export class Snapline extends Disposable {
   public options: Snapline.Options
   public name = 'snapline'
 
-  constructor(options: Snapline.Options) {
+  constructor(options: Snapline.Options = { enabled: true }) {
     super()
     this.options = { tolerance: 10, ...options }
     CssLoader.ensure(this.name, content)
@@ -29,12 +29,10 @@ export class Snapline extends Disposable {
 
   enable() {
     this.snaplineImpl.enable()
-    return this
   }
 
   disable() {
     this.snaplineImpl.disable()
-    return this
   }
 
   toggleEnabled(enabled?: boolean) {

packages/x6-plugin-stencil/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-transform/CHANGELOG.md

@@ -1,3 +1,17 @@
+## @antv/x6-plugin-transform [2.1.6](https://github.com/antvis/x6/compare/@antv/x6-plugin-transform@2.1.5...@antv/x6-plugin-transform@2.1.6) (2023-02-24)
+
+
+### Bug Fixes
+
+* transform active-handle class should remove when active removed ([#3298](https://github.com/antvis/x6/issues/3298)) ([709a141](https://github.com/antvis/x6/commit/709a141e28e9f25d54ece0ade353bd343ac0e55f))
+
+## @antv/x6-plugin-transform [2.1.5](https://github.com/antvis/x6/compare/@antv/x6-plugin-transform@2.1.4...@antv/x6-plugin-transform@2.1.5) (2022-12-24)
+
+
+### Bug Fixes
+
+* add defense for view in transform plugin ([#3092](https://github.com/antvis/x6/issues/3092)) ([fb8098c](https://github.com/antvis/x6/commit/fb8098c1c06440dd69f4e93881fd36f7e6de2a56))
+
 ## @antv/x6-plugin-transform [2.1.4](https://github.com/antvis/x6/compare/@antv/x6-plugin-transform@2.1.3...@antv/x6-plugin-transform@2.1.4) (2022-12-07)
 
 

packages/x6-plugin-transform/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-plugin-transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-plugin-transform",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "transform plugin for X6",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-plugin-transform/src/index.ts

@@ -7,14 +7,18 @@ export class Transform extends Basecoat<Transform.EventArgs> {
   private graph: Graph
   protected widgets: Map<Node, TransformImpl> = new Map()
   public name = 'transform'
+  private disabled = false
 
-  constructor(public readonly options: Transform.Options) {
+  constructor(public readonly options: Transform.Options = {}) {
     super()
     CssLoader.ensure(this.name, content)
   }
 
   init(graph: Graph) {
     this.graph = graph
+    if (this.disabled) {
+      return
+    }
     this.startListening()
   }
 
@@ -28,6 +32,24 @@ export class Transform extends Basecoat<Transform.EventArgs> {
     this.graph.off('blank:mousedown', this.onBlankMouseDown, this)
   }
 
+  enable() {
+    if (this.disabled) {
+      this.disabled = false
+      this.startListening()
+    }
+  }
+
+  disable() {
+    if (!this.disabled) {
+      this.disabled = true
+      this.stopListening()
+    }
+  }
+
+  isEnabled() {
+    return !this.disabled
+  }
+
   protected onNodeClick({ node }: EventArgs['node:click']) {
     this.clearWidgets()
     const widget = this.createTransform(node)

packages/x6-plugin-transform/src/transform.ts

@@ -107,7 +107,11 @@ export class TransformImpl extends View<TransformImpl.EventArgs> {
 
   render() {
     this.renderHandles()
-    this.view.addClass(Private.NODE_CLS)
+
+    if (this.view) {
+      this.view.addClass(Private.NODE_CLS)
+    }
+
     Dom.addClass(this.container, this.containerClassName)
     Dom.toggleClass(
       this.container,
@@ -153,7 +157,9 @@ export class TransformImpl extends View<TransformImpl.EventArgs> {
   }
 
   remove() {
-    this.view.removeClass(Private.NODE_CLS)
+    if (this.view) {
+      this.view.removeClass(Private.NODE_CLS)
+    }
     return super.remove()
   }
 
@@ -487,7 +493,7 @@ export class TransformImpl extends View<TransformImpl.EventArgs> {
     Dom.removeClass(this.container, `${this.containerClassName}-active`)
 
     if (this.handle) {
-      Dom.removeClass(this.handle, `${this.containerClassName}-active`)
+      Dom.removeClass(this.handle, `${this.containerClassName}-active-handle`)
 
       const pos = this.handle.getAttribute(
         'data-position',

packages/x6-react-components/CHANGELOG.md

@@ -1,3 +1,17 @@
+## @antv/x6-react-components [2.0.7](https://github.com/antvis/x6/compare/@antv/x6-react-components@2.0.6...@antv/x6-react-components@2.0.7) (2023-01-31)
+
+
+### Bug Fixes
+
+* don't hide when click on color picker ([#3172](https://github.com/antvis/x6/issues/3172)) ([cae8625](https://github.com/antvis/x6/commit/cae8625feb20fd93cc8002fa6ed00d345d3cf33c))
+
+## @antv/x6-react-components [2.0.6](https://github.com/antvis/x6/compare/@antv/x6-react-components@2.0.5...@antv/x6-react-components@2.0.6) (2023-01-17)
+
+
+### Bug Fixes
+
+* stop propagation when click menu item ([#3147](https://github.com/antvis/x6/issues/3147)) ([90dad14](https://github.com/antvis/x6/commit/90dad14d7e1ad8639b80b215596c8f4bad7b00ed))
+
 ## @antv/x6-react-components [2.0.5](https://github.com/antvis/x6/compare/@antv/x6-react-components@2.0.4...@antv/x6-react-components@2.0.5) (2022-11-25)
 
 

packages/x6-react-components/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-react-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-react-components",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "React components for building x6 editors",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-react-components/src/color-picker/index.tsx

@@ -37,7 +37,9 @@ export class ColorPicker extends React.Component<
 
   onDocumentClick = (e: React.MouseEvent) => {
     const target = e.target as HTMLDivElement
-    if (target === this.container || this.container.contains(target)) {
+    const picker = this.container.querySelector('.sketch-picker')!
+
+    if (target === picker || picker.contains(target)) {
       return
     }
 
@@ -59,12 +61,9 @@ export class ColorPicker extends React.Component<
     if (this.props.onChange) {
       this.props.onChange(value, event)
     }
-
     this.setState({
-      active: false,
       color: value.rgb,
     })
-    this.unbindDocEvent()
   }
 
   handleClick = (e: React.MouseEvent) => {
@@ -84,8 +83,10 @@ export class ColorPicker extends React.Component<
     }
   }
 
-  refContainer = (container: HTMLDivElement) => {
-    this.container = container
+  refContainer = (popoverRef: { getContainer: () => HTMLDivElement }) => {
+    if (popoverRef) {
+      this.container = popoverRef.getContainer()
+    }
   }
 
   renderPicker() {
@@ -123,10 +124,12 @@ export class ColorPicker extends React.Component<
         {...popoverProps}
         content={this.renderPicker()}
         overlayClassName={`${baseCls}-overlay`}
+        destroyTooltipOnHide
+        ref={this.refContainer}
+        trigger={[]}
       >
         <div
           style={style}
-          ref={this.refContainer}
           onClick={this.handleClick}
           className={classNames(baseCls, {
             [`${baseCls}-disabled`]: disabled,

packages/x6-react-components/src/menubar/item.tsx

@@ -26,6 +26,7 @@ class MenubarItemInner extends React.PureComponent<
   }
 
   onClick = (e: React.MouseEvent) => {
+    e.stopPropagation()
     this.props.context.activeMenubar()
     this.removeDeactive(e.currentTarget.parentElement)
     this.active()

packages/x6-react-shape/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-vue-shape/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @antv/x6-vue-shape [2.0.9](https://github.com/antvis/x6/compare/@antv/x6-vue-shape@2.0.8...@antv/x6-vue-shape@2.0.9) (2022-12-21)
+
+
+### Bug Fixes
+
+* get graph from right place ([#3078](https://github.com/antvis/x6/issues/3078)) ([844ee5f](https://github.com/antvis/x6/commit/844ee5fa043cbcd788ec1693f88576e797426228))
+
 ## @antv/x6-vue-shape [2.0.7](https://github.com/antvis/x6/compare/@antv/x6-vue-shape@2.0.6...@antv/x6-vue-shape@2.0.7) (2022-12-09)
 
 

packages/x6-vue-shape/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6-vue-shape/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6-vue-shape",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "X6 shape for rendering vue components.",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6-vue-shape/src/view.ts

@@ -26,6 +26,7 @@ export class VueShapeView extends NodeView<VueShape> {
     this.unmountVueComponent()
     const root = this.getComponentContainer()
     const node = this.cell
+    const graph = this.graph
 
     if (root) {
       const { component } = shapeMaps[node.shape]
@@ -40,13 +41,13 @@ export class VueShapeView extends NodeView<VueShape> {
             provide() {
               return {
                 getNode: () => node,
-                getGraph: () => this.graph,
+                getGraph: () => graph,
               }
             },
           })
         } else if (isVue3) {
           if (isActive()) {
-            connect(this.targetId(), component, root, node, this.graph)
+            connect(this.targetId(), component, root, node, graph)
           } else {
             this.vm = createApp({
               render() {
@@ -55,7 +56,7 @@ export class VueShapeView extends NodeView<VueShape> {
               provide() {
                 return {
                   getNode: () => node,
-                  getGraph: () => this.graph,
+                  getGraph: () => graph,
                 }
               },
             })

packages/x6/CHANGELOG.md

@@ -1,3 +1,52 @@
+# @antv/x6 [2.3.0](https://github.com/antvis/x6/compare/@antv/x6@2.2.1...@antv/x6@2.3.0) (2023-02-06)
+
+
+### Bug Fixes
+
+* **scheduler:** remove spammy console.log ([#3200](https://github.com/antvis/x6/issues/3200)) ([1f83a2b](https://github.com/antvis/x6/commit/1f83a2b8a84b53303293e724e7f9d0ee49182efc))
+
+
+### Features
+
+* add options for positionCell api ([#3208](https://github.com/antvis/x6/issues/3208)) ([58c0fe4](https://github.com/antvis/x6/commit/58c0fe459c0314997440b4af7dc0443abe199924))
+
+## @antv/x6 [2.2.1](https://github.com/antvis/x6/compare/@antv/x6@2.2.0...@antv/x6@2.2.1) (2023-02-02)
+
+
+### Bug Fixes
+
+* ensure the container in html view ([#3196](https://github.com/antvis/x6/issues/3196)) ([3a59703](https://github.com/antvis/x6/commit/3a59703f1c2da3ac8c8471eb9b864ac4cf468f97))
+
+# @antv/x6 [2.2.0](https://github.com/antvis/x6/compare/@antv/x6@2.1.7...@antv/x6@2.2.0) (2023-01-31)
+
+
+### Features
+
+* add port events ([#3185](https://github.com/antvis/x6/issues/3185)) ([3265fe5](https://github.com/antvis/x6/commit/3265fe5b983f22e34d60c647212824961ecfdab5))
+
+## @antv/x6 [2.1.6](https://github.com/antvis/x6/compare/@antv/x6@2.1.5...@antv/x6@2.1.6) (2023-01-19)
+
+## @antv/x6 [2.1.5](https://github.com/antvis/x6/compare/@antv/x6@2.1.4...@antv/x6@2.1.5) (2023-01-13)
+
+
+### Bug Fixes
+
+* update group even group is empty ([#3117](https://github.com/antvis/x6/issues/3117)) ([6abd068](https://github.com/antvis/x6/commit/6abd0683eab22eb0fa1a4702642ab76b91320694))
+
+## @antv/x6 [2.1.4](https://github.com/antvis/x6/compare/@antv/x6@2.1.3...@antv/x6@2.1.4) (2023-01-03)
+
+
+### Bug Fixes
+
+* optimize rendering logic to prevent loops ([#3108](https://github.com/antvis/x6/issues/3108)) ([45337e4](https://github.com/antvis/x6/commit/45337e4a62224aaffd60fc8b2670a071c5560796))
+
+## @antv/x6 [2.1.3](https://github.com/antvis/x6/compare/@antv/x6@2.1.2...@antv/x6@2.1.3) (2022-12-24)
+
+
+### Bug Fixes
+
+* schedule edge when source and target is not ready ([#3090](https://github.com/antvis/x6/issues/3090)) ([019333d](https://github.com/antvis/x6/commit/019333d79d7f22c44c400f29d501497f4323af1a))
+
 ## @antv/x6 [2.1.1](https://github.com/antvis/x6/compare/@antv/x6@2.1.0...@antv/x6@2.1.1) (2022-12-19)
 
 

packages/x6/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2022 Alipay.inc
+Copyright (c) 2021-2023 Alipay.inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/x6/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/x6",
-  "version": "2.1.1",
+  "version": "2.6.1",
   "description": "JavaScript diagramming library that uses SVG and HTML for rendering",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/x6/src/graph/events.ts

@@ -1,6 +1,7 @@
 import { Dom } from '@antv/x6-common'
 import { Model } from '../model'
 import { CellView } from '../view'
+import { Scheduler } from '../renderer/scheduler'
 
 interface CommonEventArgs<E> {
   e: E
@@ -13,7 +14,8 @@ interface PositionEventArgs<E> extends CommonEventArgs<E> {
 
 export interface EventArgs
   extends Omit<Model.EventArgs, 'sorted' | 'updated' | 'reseted'>,
-    CellView.EventArgs {
+    CellView.EventArgs,
+    Scheduler.EventArgs {
   'model:sorted'?: Model.EventArgs['sorted']
   'model:updated': Model.EventArgs['updated']
   'model:reseted': Model.EventArgs['reseted']

packages/x6/src/graph/graph.ts

@@ -702,8 +702,8 @@ export class Graph extends Basecoat<EventArgs> {
   /**
    * Position the center of graph to the center of the viewport.
    */
-  center() {
-    return this.centerPoint()
+  center(options?: Transform.CenterOptions) {
+    return this.centerPoint(options)
   }
 
   /**
@@ -712,13 +712,25 @@ export class Graph extends Basecoat<EventArgs> {
    * only center along the specified dimension and keep the other coordinate
    * unchanged.
    */
-  centerPoint(x: number, y: null | number): this
-  centerPoint(x: null | number, y: number): this
-  centerPoint(): this
-  centerPoint(x?: number | null, y?: number | null) {
+  centerPoint(
+    x: number,
+    y: null | number,
+    options?: Transform.CenterOptions,
+  ): this
+  centerPoint(
+    x: null | number,
+    y: number,
+    options?: Transform.CenterOptions,
+  ): this
+  centerPoint(optons?: Transform.CenterOptions): this
+  centerPoint(
+    x?: number | null | Transform.CenterOptions,
+    y?: number | null,
+    options?: Transform.CenterOptions,
+  ) {
     const scroller = this.getPlugin<any>('scroller')
     if (scroller) {
-      scroller.centerPoint(x as number, y as number)
+      scroller.centerPoint(x as number, y as number, options)
     } else {
       this.transform.centerPoint(x as number, y as number)
     }
@@ -737,10 +749,10 @@ export class Graph extends Basecoat<EventArgs> {
     return this
   }
 
-  centerCell(cell: Cell) {
+  centerCell(cell: Cell, options?: Transform.PositionContentOptions) {
     const scroller = this.getPlugin<any>('scroller')
     if (scroller) {
-      scroller.centerCell(cell)
+      scroller.centerCell(cell, options)
     } else {
       this.transform.centerCell(cell)
     }
@@ -752,10 +764,11 @@ export class Graph extends Basecoat<EventArgs> {
     point: Point.PointLike,
     x: number | string,
     y: number | string,
+    options: Transform.CenterOptions = {},
   ) {
     const scroller = this.getPlugin<any>('scroller')
     if (scroller) {
-      scroller.positionPoint(point, x, y)
+      scroller.positionPoint(point, x, y, options)
     } else {
       this.transform.positionPoint(point, x, y)
     }
@@ -763,10 +776,14 @@ export class Graph extends Basecoat<EventArgs> {
     return this
   }
 
-  positionRect(rect: Rectangle.RectangleLike, direction: Transform.Direction) {
+  positionRect(
+    rect: Rectangle.RectangleLike,
+    direction: Transform.Direction,
+    options?: Transform.CenterOptions,
+  ) {
     const scroller = this.getPlugin<any>('scroller')
     if (scroller) {
-      scroller.positionRect(rect, direction)
+      scroller.positionRect(rect, direction, options)
     } else {
       this.transform.positionRect(rect, direction)
     }
@@ -774,10 +791,14 @@ export class Graph extends Basecoat<EventArgs> {
     return this
   }
 
-  positionCell(cell: Cell, direction: Transform.Direction) {
+  positionCell(
+    cell: Cell,
+    direction: Transform.Direction,
+    options?: Transform.CenterOptions,
+  ) {
     const scroller = this.getPlugin<any>('scroller')
     if (scroller) {
-      scroller.positionCell(cell, direction)
+      scroller.positionCell(cell, direction, options)
     } else {
       this.transform.positionCell(cell, direction)
     }
@@ -1193,15 +1214,56 @@ export class Graph extends Basecoat<EventArgs> {
   }
 
   getPlugin<T extends Graph.Plugin>(pluginName: string): T | undefined {
-    let result: Graph.Plugin | undefined
+    return Array.from(this.installedPlugins).find(
+      (plugin) => plugin.name === pluginName,
+    ) as T
+  }
 
-    this.installedPlugins.forEach((plugin) => {
-      if (plugin.name === pluginName) {
-        result = plugin
-      }
+  getPlugins<T extends Graph.Plugin[]>(pluginName: string[]): T | undefined {
+    return Array.from(this.installedPlugins).filter((plugin) =>
+      pluginName.includes(plugin.name),
+    ) as T
+  }
+
+  disablePlugins(plugins: string[] | string) {
+    let postPlugins = plugins
+    if (!Array.isArray(postPlugins)) {
+      postPlugins = [postPlugins]
+    }
+    const aboutToChangePlugins = this.getPlugins(postPlugins)
+    aboutToChangePlugins?.forEach((plugin) => {
+      plugin?.disable?.()
     })
+    return this
+  }
 
-    return result as T
+  enablePlugins(plugins: string[] | string) {
+    let postPlugins = plugins
+    if (!Array.isArray(postPlugins)) {
+      postPlugins = [postPlugins]
+    }
+    const aboutToChangePlugins = this.getPlugins(postPlugins)
+    aboutToChangePlugins?.forEach((plugin) => {
+      plugin?.enable?.()
+    })
+    return this
+  }
+
+  disposePlugins(plugins: string[] | string) {
+    let postPlugins = plugins
+    if (!Array.isArray(postPlugins)) {
+      postPlugins = [postPlugins]
+    }
+    const aboutToChangePlugins = this.getPlugins(postPlugins)
+    aboutToChangePlugins?.forEach((plugin) => {
+      plugin.dispose()
+    })
+    return this
+  }
+
+  isPluginEnabled(pluginName: string) {
+    const pluginIns = this.getPlugin(pluginName)
+    return pluginIns?.isEnabled?.()
   }
 
   // #endregion
@@ -1349,5 +1411,8 @@ export namespace Graph {
     name: string
     init: (graph: Graph, ...options: any[]) => any
     dispose: () => void
+    disable?: () => void
+    enable?: () => void
+    isEnabled?: () => boolean
   }
 }

packages/x6/src/graph/virtual-render.ts

@@ -3,7 +3,9 @@ import { Base } from './base'
 
 export class VirtualRenderManager extends Base {
   protected init() {
-    this.resetRenderArea = FunctionExt.debounce(this.resetRenderArea, 200)
+    this.resetRenderArea = FunctionExt.throttle(this.resetRenderArea, 200, {
+      leading: true,
+    })
     this.resetRenderArea()
     this.startListening()
   }

packages/x6/src/model/model.ts

@@ -244,6 +244,13 @@ export class Model extends Basecoat<Model.EventArgs> {
     return node
   }
 
+  updateNode(metadata: Node.Metadata, options: Model.SetOptions = {}) {
+    const node = this.createNode(metadata)
+    const prop = node.getProp()
+    node.dispose()
+    return this.updateCell(prop, options)
+  }
+
   createNode(metadata: Node.Metadata) {
     return Node.create(metadata)
   }
@@ -258,6 +265,13 @@ export class Model extends Basecoat<Model.EventArgs> {
     return Edge.create(metadata)
   }
 
+  updateEdge(metadata: Edge.Metadata, options: Model.SetOptions = {}) {
+    const edge = this.createEdge(metadata)
+    const prop = edge.getProp()
+    edge.dispose()
+    return this.updateCell(prop, options)
+  }
+
   addCell(cell: Cell | Cell[], options: Model.AddOptions = {}) {
     if (Array.isArray(cell)) {
       return this.addCells(cell, options)
@@ -295,6 +309,23 @@ export class Model extends Basecoat<Model.EventArgs> {
     return this
   }
 
+  updateCell(prop: Cell.Properties, options: Model.SetOptions = {}): boolean {
+    const existing = prop.id && this.getCell(prop.id)
+    if (existing) {
+      return this.batchUpdate(
+        'update',
+        () => {
+          Object.keys(prop).forEach((key) =>
+            existing.setProp(key, prop[key], options),
+          )
+          return true
+        },
+        prop,
+      )
+    }
+    return false
+  }
+
   removeCell(cellId: string, options?: Collection.RemoveOptions): Cell | null
   removeCell(cell: Cell, options?: Collection.RemoveOptions): Cell | null
   removeCell(

packages/x6/src/registry/tool/editor.ts

@@ -92,6 +92,7 @@ export class CellEditor extends ToolsView.ToolItem<
         index: this.labelIndex,
       })
     }
+
     editor.innerText = text || ''
 
     // clear display value when edit status because char ghosting.
@@ -105,7 +106,8 @@ export class CellEditor extends ToolsView.ToolItem<
       const cell = this.cell
       const value = this.editor.innerText.replace(/\n$/, '') || ''
       // set value
-      this.setCellText(value)
+      // when value is null, we will remove label in edge
+      this.setCellText(value !== '' ? value : null)
       // remove tool
       cell.removeTool(cell.isEdge() ? 'edge-editor' : 'node-editor')
       this.undelegateDocumentEvents()
@@ -137,7 +139,7 @@ export class CellEditor extends ToolsView.ToolItem<
     }
   }
 
-  setCellText(value: string) {
+  setCellText(value: string | null) {
     const setText = this.options.setText
     if (typeof setText === 'function') {
       FunctionExt.call(setText, this.cellView, {
@@ -170,7 +172,7 @@ export namespace CellEditor {
       this: CellView,
       args: {
         cell: Cell
-        value: string
+        value: string | null
         index?: number
         distance?: number
       },
@@ -204,7 +206,9 @@ export namespace CellEditor {
       return cell.attr('text/text')
     },
     setText({ cell, value }) {
-      cell.attr('text/text', value)
+      if (value !== null) {
+        cell.attr('text/text', value)
+      }
     },
   })
 
@@ -225,18 +229,20 @@ export namespace CellEditor {
     setText({ cell, value, index, distance }) {
       const edge = cell as Edge
       if (index === -1) {
-        edge.appendLabel({
-          position: {
-            distance: distance!,
-          },
-          attrs: {
-            label: {
-              text: value,
-            },
-          },
-        })
-      } else {
         if (value) {
+          edge.appendLabel({
+            position: {
+              distance: distance!,
+            },
+            attrs: {
+              label: {
+                text: value,
+              },
+            },
+          })
+        }
+      } else {
+        if (value !== null) {
           edge.prop(`labels/${index}/attrs/label/text`, value)
         } else if (typeof index === 'number') {
           edge.removeLabelAt(index)

packages/x6/src/renderer/queueJob.ts

@@ -7,7 +7,7 @@ export class JobQueue {
   private initialTime = Date.now()
 
   queueJob(job: Job) {
-    if (job.priority === JOB_PRIORITY.PRIOR) {
+    if (job.priority & JOB_PRIORITY.PRIOR) {
       job.cb()
     } else {
       const index = this.findInsertionIndex(job)
@@ -46,11 +46,7 @@ export class JobQueue {
 
     let job
     while ((job = this.queue.shift())) {
-      try {
-        job.cb()
-      } catch (error) {
-        // pass
-      }
+      job.cb()
       if (this.getCurrentTime() - startTime >= this.frameInterval) {
         break
       }
@@ -81,11 +77,20 @@ export class JobQueue {
   }
 
   private findInsertionIndex(job: Job) {
-    let start = 0
-    while (this.queue[start] && this.queue[start].priority >= job.priority) {
-      start += 1
+    let left = 0
+    let ins = this.queue.length
+    let right = ins - 1
+    const priority = job.priority
+    while (left <= right) {
+      const mid = ((right - left) >> 1) + left
+      if (priority <= this.queue[mid].priority) {
+        left = mid + 1
+      } else {
+        ins = mid
+        right = mid - 1
+      }
     }
-    return start
+    return ins
   }
 
   private scheduleJob() {
@@ -135,10 +140,10 @@ export interface Job {
 }
 
 export enum JOB_PRIORITY {
-  RenderEdge = 1,
-  RenderNode = 2,
-  Update = 3,
-  PRIOR = 100,
+  RenderEdge = /**/ 1 << 1,
+  RenderNode = /**/ 1 << 2,
+  Update = /*    */ 1 << 3,
+  PRIOR = /*     */ 1 << 20,
 }
 
 // function findInsertionIndex(job: Job) {

packages/x6/src/renderer/scheduler.ts

@@ -8,6 +8,7 @@ import { Graph } from '../graph'
 
 export class Scheduler extends Disposable {
   public views: KeyValue<Scheduler.View> = {}
+  public willRemoveViews: KeyValue<Scheduler.View> = {}
   protected zPivots: KeyValue<Comment>
   private graph: Graph
   private renderArea?: Rectangle
@@ -51,7 +52,7 @@ export class Scheduler extends Disposable {
   protected onModelReseted({ options }: Model.EventArgs['reseted']) {
     this.queue.clearJobs()
     this.removeZPivots()
-    this.removeViews()
+    this.resetViews()
     this.renderViews(this.model.getCells(), options)
   }
 
@@ -59,12 +60,8 @@ export class Scheduler extends Disposable {
     this.renderViews([cell], options)
   }
 
-  protected onCellRemoved({ cell, options }: Model.EventArgs['cell:removed']) {
-    const viewItem = this.views[cell.id]
-    if (viewItem) {
-      const view = viewItem.view
-      this.requestViewUpdate(view, Scheduler.FLAG_REMOVE, options)
-    }
+  protected onCellRemoved({ cell }: Model.EventArgs['cell:removed']) {
+    this.removeViews([cell])
   }
 
   protected onCellZIndexChanged({
@@ -186,7 +183,7 @@ export class Scheduler extends Disposable {
           viewItem.view,
           flag,
           options,
-          cell.isNode() ? JOB_PRIORITY.RenderNode : JOB_PRIORITY.RenderEdge,
+          this.getRenderPriority(viewItem.view),
           false,
         )
       }
@@ -205,7 +202,7 @@ export class Scheduler extends Disposable {
     }
 
     let result = 0
-    if (this.isInRenderArea(view)) {
+    if (this.isUpdateable(view)) {
       result = this.updateView(view, flag, options)
       viewItem.flag = result
     } else {
@@ -218,10 +215,43 @@ export class Scheduler extends Disposable {
     }
 
     if (result) {
-      console.log('left flag', result) // eslint-disable-line
+      if (
+        cell.isEdge() &&
+        (result & view.getFlag(['source', 'target'])) === 0
+      ) {
+        this.queue.queueJob({
+          id,
+          priority: JOB_PRIORITY.RenderEdge,
+          cb: () => {
+            this.updateView(view, flag, options)
+          },
+        })
+      }
     }
   }
 
+  protected removeViews(cells: Cell[]) {
+    cells.forEach((cell) => {
+      const id = cell.id
+      const viewItem = this.views[id]
+
+      if (viewItem) {
+        this.willRemoveViews[id] = viewItem
+        delete this.views[id]
+
+        this.queue.queueJob({
+          id,
+          priority: this.getRenderPriority(viewItem.view),
+          cb: () => {
+            this.removeView(viewItem.view)
+          },
+        })
+      }
+    })
+
+    this.flush()
+  }
+
   protected flush() {
     this.graph.options.async
       ? this.queue.queueFlush()
@@ -234,10 +264,13 @@ export class Scheduler extends Disposable {
       const viewItem = this.views[ids[i]]
       if (viewItem && viewItem.state === Scheduler.ViewState.WAITTING) {
         const { view, flag, options } = viewItem
-        const priority = view.cell.isNode()
-          ? JOB_PRIORITY.RenderNode
-          : JOB_PRIORITY.RenderEdge
-        this.requestViewUpdate(view, flag, options, priority, false)
+        this.requestViewUpdate(
+          view,
+          flag,
+          options,
+          this.getRenderPriority(view),
+          false,
+        )
       }
     }
 
@@ -280,26 +313,30 @@ export class Scheduler extends Disposable {
       }
 
       viewItem.state = Scheduler.ViewState.MOUNTED
+      this.graph.trigger('view:mounted', { view })
     }
   }
 
-  protected removeViews() {
-    Object.keys(this.views).forEach((id) => {
-      const viewItem = this.views[id]
+  protected resetViews() {
+    this.willRemoveViews = { ...this.views }
+    Object.keys(this.willRemoveViews).forEach((id) => {
+      const viewItem = this.willRemoveViews[id]
       if (viewItem) {
-        this.removeView(viewItem.view.cell)
+        this.removeView(viewItem.view)
       }
     })
     this.views = {}
+    this.willRemoveViews = {}
   }
 
-  protected removeView(cell: Cell) {
-    const viewItem = this.views[cell.id]
-    if (viewItem) {
+  protected removeView(view: CellView) {
+    const cell = view.cell
+    const viewItem = this.willRemoveViews[cell.id]
+    if (view) {
       viewItem.view.remove()
-      delete this.views[cell.id]
+      delete this.willRemoveViews[cell.id]
+      this.graph.trigger('view:unmounted', { view })
     }
-    return viewItem.view
   }
 
   protected toggleVisible(cell: Cell, visible: boolean) {
@@ -415,10 +452,16 @@ export class Scheduler extends Disposable {
     for (let i = 0, n = edges.length; i < n; i += 1) {
       const edge = edges[i]
       const viewItem = this.views[edge.id]
+
       if (!viewItem) {
         continue
       }
+
       const edgeView = viewItem.view
+      if (!this.isViewMounted(edgeView)) {
+        continue
+      }
+
       const flagLabels: FlagManager.Action[] = ['update']
       if (edge.getTargetCell() === cell) {
         flagLabels.push('target')
@@ -436,11 +479,40 @@ export class Scheduler extends Disposable {
     return effectedEdges
   }
 
-  protected isInRenderArea(view: CellView) {
-    return (
-      !this.renderArea ||
-      this.renderArea.isIntersectWithRect(view.cell.getBBox())
-    )
+  protected isUpdateable(view: CellView) {
+    if (view.isNodeView()) {
+      if (!this.renderArea) {
+        return true
+      }
+      const node = view.cell
+      return this.renderArea.isIntersectWithRect(node.getBBox())
+    }
+    if (view.isEdgeView()) {
+      const edge = view.cell
+      const sourceCell = edge.getSourceCell()
+      const targetCell = edge.getTargetCell()
+      if (sourceCell) {
+        const sourceViewItem = this.views[sourceCell.id]
+        if (sourceViewItem && !this.isViewMounted(sourceViewItem.view)) {
+          return false
+        }
+      }
+
+      if (targetCell) {
+        const targetViewItem = this.views[targetCell.id]
+        if (targetViewItem && !this.isViewMounted(targetViewItem.view)) {
+          return false
+        }
+      }
+    }
+
+    return true
+  }
+
+  protected getRenderPriority(view: CellView) {
+    return view.cell.isNode()
+      ? JOB_PRIORITY.RenderNode
+      : JOB_PRIORITY.RenderEdge
   }
 
   @Disposable.dispose()
@@ -466,4 +538,9 @@ export namespace Scheduler {
     options: any
     state: ViewState
   }
+
+  export interface EventArgs {
+    'view:mounted': { view: CellView }
+    'view:unmounted': { view: CellView }
+  }
 }

packages/x6/src/shape/html.ts

@@ -36,7 +36,8 @@ export namespace HTML {
     }
 
     protected renderHTMLComponent() {
-      const container = this.selectors.foContent as Element
+      const container =
+        this.selectors && (this.selectors.foContent as HTMLDivElement)
       if (container) {
         Dom.empty(container)
         const content = shapeMaps[this.cell.shape]

packages/x6/src/view/edge.ts

@@ -1398,6 +1398,7 @@ export class EdgeView<
   }
 
   onMouseDown(e: Dom.MouseDownEvent, x: number, y: number) {
+    this.notifyMouseDown(e, x, y)
     this.startEdgeDragging(e, x, y)
   }
 
@@ -2191,7 +2192,9 @@ export class EdgeView<
     for (let i = 0, ii = cells.length; i < ii; i += 1) {
       const view = graph.findViewByCell(cells[i])
 
-      if (!view) {
+      // Prevent highlighting new edge
+      // Close https://github.com/antvis/X6/issues/2853
+      if (!view || view.cell.id === this.cell.id) {
         continue
       }
 

packages/x6/src/view/node.ts

@@ -357,7 +357,12 @@ export class NodeView<
 
   protected updatePorts() {
     const groups = this.cell.getParsedGroups()
-    Object.keys(groups).forEach((groupName) => this.updatePortGroup(groupName))
+    const groupList = Object.keys(groups)
+    if (groupList.length === 0) {
+      this.updatePortGroup()
+    } else {
+      groupList.forEach((groupName) => this.updatePortGroup(groupName))
+    }
   }
 
   protected updatePortGroup(groupName?: string) {
@@ -452,6 +457,28 @@ export class NodeView<
     return { e, x, y, view, node, cell } as NodeView.PositionEventArgs<E>
   }
 
+  protected getPortEventArgs<E>(
+    e: E,
+    port: string,
+    pos?: { x: number; y: number },
+  ) {
+    const view = this // eslint-disable-line
+    const node = view.cell
+    const cell = node
+    if (pos) {
+      return {
+        e,
+        x: pos.x,
+        y: pos.y,
+        view,
+        node,
+        cell,
+        port,
+      } as NodeView.PositionEventArgs<E>
+    }
+    return { e, view, node, cell, port } as NodeView.MouseEventArgs<E>
+  }
+
   notifyMouseDown(e: Dom.MouseDownEvent, x: number, y: number) {
     super.onMouseDown(e, x, y)
     this.notify('node:mousedown', this.getEventArgs(e, x, y))
@@ -467,19 +494,33 @@ export class NodeView<
     this.notify('node:mouseup', this.getEventArgs(e, x, y))
   }
 
+  notifyPortEvent(
+    name: string,
+    e: Dom.EventObject,
+    pos?: { x: number; y: number },
+  ) {
+    const port = this.findAttr('port', e.target)
+    if (port) {
+      this.notify(name, this.getPortEventArgs(e, port, pos))
+    }
+  }
+
   onClick(e: Dom.ClickEvent, x: number, y: number) {
     super.onClick(e, x, y)
     this.notify('node:click', this.getEventArgs(e, x, y))
+    this.notifyPortEvent('node:port:click', e, { x, y })
   }
 
   onDblClick(e: Dom.DoubleClickEvent, x: number, y: number) {
     super.onDblClick(e, x, y)
     this.notify('node:dblclick', this.getEventArgs(e, x, y))
+    this.notifyPortEvent('node:port:dblclick', e, { x, y })
   }
 
   onContextMenu(e: Dom.ContextMenuEvent, x: number, y: number) {
     super.onContextMenu(e, x, y)
     this.notify('node:contextmenu', this.getEventArgs(e, x, y))
+    this.notifyPortEvent('node:port:contextmenu', e, { x, y })
   }
 
   onMouseDown(e: Dom.MouseDownEvent, x: number, y: number) {
@@ -487,6 +528,7 @@ export class NodeView<
       return
     }
     this.notifyMouseDown(e, x, y)
+    this.notifyPortEvent('node:port:mousedown', e, { x, y })
     this.startNodeDragging(e, x, y)
   }
 
@@ -510,6 +552,7 @@ export class NodeView<
         })
       }
       this.notifyMouseMove(e, x, y)
+      this.notifyPortEvent('node:port:mousemove', e, { x, y })
     }
 
     this.setEventData<EventData.Mousemove>(e, data)
@@ -522,6 +565,7 @@ export class NodeView<
       this.stopMagnetDragging(e, x, y)
     } else {
       this.notifyMouseUp(e, x, y)
+      this.notifyPortEvent('node:port:mouseup', e, { x, y })
       if (action === 'move') {
         const meta = data as EventData.Moving
         const view = meta.targetView || this
@@ -540,22 +584,26 @@ export class NodeView<
   onMouseOver(e: Dom.MouseOverEvent) {
     super.onMouseOver(e)
     this.notify('node:mouseover', this.getEventArgs(e))
+    this.notifyPortEvent('node:port:mouseover', e)
   }
 
   onMouseOut(e: Dom.MouseOutEvent) {
     super.onMouseOut(e)
     this.notify('node:mouseout', this.getEventArgs(e))
+    this.notifyPortEvent('node:port:mouseout', e)
   }
 
   onMouseEnter(e: Dom.MouseEnterEvent) {
     this.updateClassName(e)
     super.onMouseEnter(e)
     this.notify('node:mouseenter', this.getEventArgs(e))
+    this.notifyPortEvent('node:port:mouseenter', e)
   }
 
   onMouseLeave(e: Dom.MouseLeaveEvent) {
     super.onMouseLeave(e)
     this.notify('node:mouseleave', this.getEventArgs(e))
+    this.notifyPortEvent('node:port:mouseleave', e)
   }
 
   onMouseWheel(e: Dom.EventObject, x: number, y: number, delta: number) {
@@ -1087,14 +1135,13 @@ export namespace NodeView {
   interface MagnetEventArgs {
     magnet: Element
   }
-
   export interface MouseEventArgs<E> {
     e: E
     node: Node
     cell: Node
     view: NodeView
+    port?: string
   }
-
   export interface PositionEventArgs<E>
     extends MouseEventArgs<E>,
       CellView.PositionEventArgs {}
@@ -1119,6 +1166,17 @@ export namespace NodeView {
     'node:mousewheel': PositionEventArgs<Dom.EventObject> &
       CellView.MouseDeltaEventArgs
 
+    'node:port:click': PositionEventArgs<Dom.ClickEvent>
+    'node:port:dblclick': PositionEventArgs<Dom.DoubleClickEvent>
+    'node:port:contextmenu': PositionEventArgs<Dom.ContextMenuEvent>
+    'node:port:mousedown': PositionEventArgs<Dom.MouseDownEvent>
+    'node:port:mousemove': PositionEventArgs<Dom.MouseMoveEvent>
+    'node:port:mouseup': PositionEventArgs<Dom.MouseUpEvent>
+    'node:port:mouseover': MouseEventArgs<Dom.MouseOverEvent>
+    'node:port:mouseout': MouseEventArgs<Dom.MouseOutEvent>
+    'node:port:mouseenter': MouseEventArgs<Dom.MouseEnterEvent>
+    'node:port:mouseleave': MouseEventArgs<Dom.MouseLeaveEvent>
+
     'node:customevent': PositionEventArgs<Dom.MouseDownEvent> & {
       name: string
     }

scripts/preinstall

@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-
-if (!/pnpm/.test(process.env.npm_execpath || '')) {
-  console.warn(
-    `This repository requires using pnpm as the package manager for scripts to work properly.`,
-  )
-  process.exit(1)
-}

sites/x6-sites/.dumi/global.ts

@@ -1,18 +1,19 @@
 if (window) {
-  (window as any).react = require('react');
-  (window as any).reactDom = require('react-dom');
-  (window as any).antd = require('antd');
-  (window as any).dagre = require('dagre');
-  (window as any).x6 = require('@antv/x6');
-  (window as any).x6PluginSnapline = require('@antv/x6-plugin-snapline');
-  (window as any).x6PluginClipboard = require('@antv/x6-plugin-clipboard');
-  (window as any).x6PluginKeyboard = require('@antv/x6-plugin-keyboard');
-  (window as any).x6PluginSelection = require('@antv/x6-plugin-selection');
-  (window as any).x6PluginTransform = require('@antv/x6-plugin-transform');
-  (window as any).x6PluginStencil = require('@antv/x6-plugin-stencil');
-  (window as any).x6PluginHistory = require('@antv/x6-plugin-history');
-  (window as any).x6ReactShape = require('@antv/x6-react-shape');
-  (window as any).layout = require('@antv/layout');
-  (window as any).hierarchy = require('@antv/hierarchy');
-  (window as any).elkjs = require('elkjs/lib/elk.bundled.js');
-}
+  ;(window as any).react = require('react')
+  ;(window as any).reactDom = require('react-dom')
+  ;(window as any).antd = require('antd')
+  ;(window as any).dagre = require('dagre')
+  ;(window as any).x6 = require('@antv/x6')
+  ;(window as any).x6PluginSnapline = require('@antv/x6-plugin-snapline')
+  ;(window as any).x6PluginClipboard = require('@antv/x6-plugin-clipboard')
+  ;(window as any).x6PluginKeyboard = require('@antv/x6-plugin-keyboard')
+  ;(window as any).x6PluginSelection = require('@antv/x6-plugin-selection')
+  ;(window as any).x6PluginTransform = require('@antv/x6-plugin-transform')
+  ;(window as any).x6PluginStencil = require('@antv/x6-plugin-stencil')
+  ;(window as any).x6PluginHistory = require('@antv/x6-plugin-history')
+  ;(window as any).x6ReactShape = require('@antv/x6-react-shape')
+  ;(window as any).layout = require('@antv/layout')
+  ;(window as any).classnames = require('classnames')
+  ;(window as any).hierarchy = require('@antv/hierarchy')
+  ;(window as any).elkjs = require('elkjs/lib/elk.bundled.js')
+}

sites/x6-sites/.dumirc.ts

@@ -1,25 +1,28 @@
-import { defineConfig } from 'dumi';
-import { repository, version } from './package.json';
+import { defineConfig } from 'dumi'
+import { repository } from './package.json'
 
 export default defineConfig({
-  locales: [{ id: 'zh', name: '中文' }, { id: 'en', name: 'English' }],
+  locales: [
+    { id: 'zh', name: '中文' },
+    { id: 'en', name: 'English' },
+  ],
   themeConfig: {
     title: 'X6',
     description: 'JavaScript diagramming library',
     defaultLanguage: 'zh',
     siteUrl: 'https://x6.antv.antgroup.com',
     isAntVSite: false,
-    githubUrl: repository,                                              // GitHub 地址
-    showSearch: true,                                                   // 是否显示搜索框
-    showGithubCorner: true,                                             // 是否显示头部的 GitHub icon
-    showGithubStars: true,                                              // 是否显示 GitHub star 数量
-    showAntVProductsCard: true,                                         // 是否显示 AntV 产品汇总的卡片
-    showLanguageSwitcher: false,                                        // 是否显示官网语言切换
-    showWxQrcode: true,                                                 // 是否显示头部菜单的微信公众号
-    showChartResize: true,                                              // 是否在 demo 页展示图表视图切换
-    showAPIDoc: false,                                                  // 是否在 demo 页展示API文档
+    githubUrl: repository, // GitHub 地址
+    showSearch: true, // 是否显示搜索框
+    showGithubCorner: true, // 是否显示头部的 GitHub icon
+    showGithubStars: true, // 是否显示 GitHub star 数量
+    showAntVProductsCard: true, // 是否显示 AntV 产品汇总的卡片
+    showLanguageSwitcher: false, // 是否显示官网语言切换
+    showWxQrcode: true, // 是否显示头部菜单的微信公众号
+    showChartResize: true, // 是否在 demo 页展示图表视图切换
+    showAPIDoc: false, // 是否在 demo 页展示API文档
     versions: {
-      [version]: 'https://x6.antv.antgroup.com',
+      '2.x': 'https://x6.antv.antgroup.com',
       '1.x': 'https://x6.antv.vision',
     },
     navs: [
@@ -73,7 +76,8 @@ export default defineConfig({
         zh: 'X6 是基于 HTML 和 SVG 的图编辑引擎，提供低成本的定制能力和开箱即用的内置扩展，方便我们快速搭建 DAG 图、ER 图、流程图、血缘图等应用。',
         en: 'X6 是基于 HTML 和 SVG 的图编辑引擎，提供低成本的定制能力和开箱即用的内置扩展，方便我们快速搭建 DAG 图、ER 图、流程图、血缘图等应用。',
       },
-      image: 'https://mdn.alipayobjects.com/huamei_f4t1bn/afts/img/A*A1g0RaZ-GJcAAAAAAAAAAAAADtOHAQ/original',
+      image:
+        'https://mdn.alipayobjects.com/huamei_f4t1bn/afts/img/A*A1g0RaZ-GJcAAAAAAAAAAAAADtOHAQ/original',
       buttons: [
         {
           text: {
@@ -152,19 +156,44 @@ export default defineConfig({
           zh: '可视化编排可以用简单的方式将复杂的流程呈现出来，让用户更容易理解工作流',
           en: '可视化编排可以用简单的方式将复杂的流程呈现出来，让用户更容易理解工作流',
         },
-        image: 'https://mdn.alipayobjects.com/huamei_f4t1bn/afts/img/A*QsT0TpxA8-AAAAAAAAAAAAAADtOHAQ/original',
+        image:
+          'https://mdn.alipayobjects.com/huamei_f4t1bn/afts/img/A*QsT0TpxA8-AAAAAAAAAAAAAADtOHAQ/original',
         isAppLogo: true,
       },
     ],
     companies: [
-      { name: '阿里云', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*V_xMRIvw2iwAAAAAAAAAAABkARQnAQ' },
-      { name: '支付宝', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*lYDrRZvcvD4AAAAAAAAAAABkARQnAQ', },
-      { name: '天猫', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*BQrxRK6oemMAAAAAAAAAAABkARQnAQ', },
-      { name: '淘宝网', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*1l8-TqUr7UcAAAAAAAAAAABkARQnAQ', },
-      { name: '网上银行', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*ZAKFQJ5Bz4MAAAAAAAAAAABkARQnAQ', },
-      { name: '京东', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*yh-HRr3hCpgAAAAAAAAAAABkARQnAQ', },
-      { name: 'yunos', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*_js7SaNosUwAAAAAAAAAAABkARQnAQ', },
-      { name: '菜鸟', img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*TgV-RZDODJIAAAAAAAAAAABkARQnAQ', },
+      {
+        name: '阿里云',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*V_xMRIvw2iwAAAAAAAAAAABkARQnAQ',
+      },
+      {
+        name: '支付宝',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*lYDrRZvcvD4AAAAAAAAAAABkARQnAQ',
+      },
+      {
+        name: '天猫',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*BQrxRK6oemMAAAAAAAAAAABkARQnAQ',
+      },
+      {
+        name: '淘宝网',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*1l8-TqUr7UcAAAAAAAAAAABkARQnAQ',
+      },
+      {
+        name: '网上银行',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*ZAKFQJ5Bz4MAAAAAAAAAAABkARQnAQ',
+      },
+      {
+        name: '京东',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*yh-HRr3hCpgAAAAAAAAAAABkARQnAQ',
+      },
+      {
+        name: 'yunos',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*_js7SaNosUwAAAAAAAAAAABkARQnAQ',
+      },
+      {
+        name: '菜鸟',
+        img: 'https://gw.alipayobjects.com/mdn/rms_2274c3/afts/img/A*TgV-RZDODJIAAAAAAAAAAABkARQnAQ',
+      },
     ],
     docs: [
       {
@@ -259,27 +288,28 @@ export default defineConfig({
       },
     ],
     docsearchOptions: {
-      apiKey: 'fe8bee8366e56a9463229c3c81200866',
-      indexName: 'antv_x6',
+      appId: '7J0MWEOGMO',
+      apiKey: 'e0d8089bb224298dfd4415b3e98bb700',
+      indexName: 'x6_sites_2.0',
+      versionV3: true,
     },
     playground: {
       extraLib: '',
-      container: '<div id="container"></div>',
+      container:
+        '<div id="container" style="min-width: 400px; min-height: 600px;"></div>',
       devDependencies: {
         typescript: 'latest',
       },
     },
     announcement: {
       zh: '',
-      en: ''
-    }
+      en: '',
+    },
   },
   mfsu: false,
   alias: {
     '@': __dirname,
   },
-  links: [
-  ],
-  scripts: [
-  ],
-})
+  links: [],
+  scripts: [],
+})

sites/x6-sites/CHANGELOG.md

@@ -1,3 +1,66 @@
+## @antv/x6-sites [1.6.3](https://github.com/antvis/x6/compare/@antv/x6-sites@1.6.2...@antv/x6-sites@1.6.3) (2023-03-02)
+
+## @antv/x6-sites [1.6.2](https://github.com/antvis/x6/compare/@antv/x6-sites@1.6.1...@antv/x6-sites@1.6.2) (2023-02-28)
+
+## @antv/x6-sites [1.6.1](https://github.com/antvis/x6/compare/@antv/x6-sites@1.6.0...@antv/x6-sites@1.6.1) (2023-02-27)
+
+## @antv/x6-sites [1.5.5](https://github.com/antvis/x6/compare/@antv/x6-sites@1.5.4...@antv/x6-sites@1.5.5) (2023-02-27)
+
+## @antv/x6-sites [1.5.4](https://github.com/antvis/x6/compare/@antv/x6-sites@1.5.3...@antv/x6-sites@1.5.4) (2023-02-24)
+
+## @antv/x6-sites [1.5.3](https://github.com/antvis/x6/compare/@antv/x6-sites@1.5.2...@antv/x6-sites@1.5.3) (2023-02-23)
+
+## @antv/x6-sites [1.5.2](https://github.com/antvis/x6/compare/@antv/x6-sites@1.5.1...@antv/x6-sites@1.5.2) (2023-02-18)
+
+# @antv/x6-sites [1.5.0](https://github.com/antvis/x6/compare/@antv/x6-sites@1.4.1...@antv/x6-sites@1.5.0) (2023-02-06)
+
+
+### Features
+
+* keyboard support clear and custom trigger ([#3202](https://github.com/antvis/x6/issues/3202)) ([668c932](https://github.com/antvis/x6/commit/668c93242fbcebb987cccc3dcfd56982f7c66252))
+
+# @antv/x6-sites [1.4.0](https://github.com/antvis/x6/compare/@antv/x6-sites@1.3.2...@antv/x6-sites@1.4.0) (2023-01-31)
+
+
+### Bug Fixes
+
+* fix index error for priorityQueue ([#3179](https://github.com/antvis/x6/issues/3179)) ([d64150b](https://github.com/antvis/x6/commit/d64150bfadf10fe21f44734a0267261260b8c53b))
+* prevent highlighting new edge ([#3170](https://github.com/antvis/x6/issues/3170)) ([bd30f7f](https://github.com/antvis/x6/commit/bd30f7f61de530a9b6671aaedd4be2e026de8d44))
+
+
+### Features
+
+* add port events ([#3185](https://github.com/antvis/x6/issues/3185)) ([3265fe5](https://github.com/antvis/x6/commit/3265fe5b983f22e34d60c647212824961ecfdab5))
+
+## @antv/x6-sites [1.3.2](https://github.com/antvis/x6/compare/@antv/x6-sites@1.3.1...@antv/x6-sites@1.3.2) (2023-01-13)
+
+
+### Bug Fixes
+
+* change dragging container options ([#3139](https://github.com/antvis/x6/issues/3139)) ([7b091f3](https://github.com/antvis/x6/commit/7b091f35dee147c5e7bf97577e14e11ceb7e8e3d))
+* update group even group is empty ([#3117](https://github.com/antvis/x6/issues/3117)) ([6abd068](https://github.com/antvis/x6/commit/6abd0683eab22eb0fa1a4702642ab76b91320694))
+
+## @antv/x6-sites [1.3.1](https://github.com/antvis/x6/compare/@antv/x6-sites@1.3.0...@antv/x6-sites@1.3.1) (2023-01-03)
+
+
+### Bug Fixes
+
+* optimize rendering logic to prevent loops ([#3108](https://github.com/antvis/x6/issues/3108)) ([45337e4](https://github.com/antvis/x6/commit/45337e4a62224aaffd60fc8b2670a071c5560796))
+
+# @antv/x6-sites [1.3.0](https://github.com/antvis/X6/compare/@antv/x6-sites@1.2.2...@antv/x6-sites@1.3.0) (2023-01-01)
+
+
+### Features
+
+* add data processing dag example ([#3091](https://github.com/antvis/X6/issues/3091)) ([d3301d3](https://github.com/antvis/X6/commit/d3301d33d575269d9219ab1337a2ec1785d61494))
+
+## @antv/x6-sites [1.2.2](https://github.com/antvis/X6/compare/@antv/x6-sites@1.2.1...@antv/x6-sites@1.2.2) (2022-12-24)
+
+
+### Bug Fixes
+
+* schedule edge when source and target is not ready ([#3090](https://github.com/antvis/X6/issues/3090)) ([019333d](https://github.com/antvis/X6/commit/019333d79d7f22c44c400f29d501497f4323af1a))
+
 # @antv/x6-sites [1.2.0](https://github.com/antvis/X6/compare/@antv/x6-sites@1.1.2...@antv/x6-sites@1.2.0) (2022-12-16)
 
 

sites/x6-sites/LEGAL.md

@@ -0,0 +1,7 @@
+Legal Disclaimer
+
+Within this source code, the comments in Chinese shall be the original, governing version. Any comment in other languages are for reference only. In the event of any conflict between the Chinese language version comments and other language version comments, the Chinese language version shall prevail.
+
+法律免责声明
+
+关于代码注释部分，中文注释为官方版本，其它语言注释仅做参考。中文注释可能与其它语言注释存在不一致，当中文注释与其它语言注释存在不一致时，请以中文注释为准。

sites/x6-sites/docs/api/graph/graph.zh.md

@@ -2,9 +2,9 @@
 title: Graph
 order: 0
 redirect_from:
-  + /zh/docs
-  + /zh/docs/api
-  + /zh/docs/api/graph
+  - /zh/docs
+  - /zh/docs/api
+  - /zh/docs/api/graph
 ---
 
 ## 配置
@@ -13,29 +13,29 @@ redirect_from:
 new Graph(options: Options)
 ```
 
-| 选项                                                                           | 类型                           | 必选 | 默认值                                            | 描述                                                                                              |
-| ------------------------------------------------------------------------------ | ------------------------------ | :--: | ------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| containers                                                             | HTMLElement                    |  ✓   |                                                   | 画布的容器。                                                                                      |
-| width                                                                | number                         |      | - | 画布宽度，默认使用容器宽度。                                                                      |
-| height                                                              | number                         |      | - | 画布高度，默认使用容器高度。                                                                      |
-| scaling                                    | { min?: number, max?: number } |      | { min: 0.01, max: 16 } | 画布的最小最大缩放级别。                                                                     |
-| [autoResize](/zh/docs/tutorial/basic/graph#画布大小)                                                      | boolean \| Element \| Document |      | `false` | 是否监听容器大小改变，并自动更新画布大小。 |
-| [panning](/zh/docs/api/graph/panning)                                          | boolean \| `PanningManager.Options` |      | `false` | 画布是否可以拖拽平移，默认禁用。                                                                                  |
-| [mousewheel](/zh/docs/api/graph/mousewheel)                                    | boolean \| `MouseWheel.Options` |      | `false` | 鼠标滚轮缩放，默认禁用。                                                                          |
-| [grid](/zh/docs/api/graph/grid)                                                | boolean \| number \| `GridManager.Options` |      | `false` | 网格，默认使用 `10px` 的网格，但不绘制网格背景。                                                  |
-| [background](/zh/docs/api/graph/background)                                    | false \| `BackgroundManager.Options` |      | `false` | 背景，默认不绘制背景。                                                                            |
-| [translating](/zh/docs/api/interacting/interaction#trasnlating)                        | `Translating.Options` |      | { restrict: false }                                            | 限制节点移动。                                                                                        |
-| [embedding](/zh/docs/api/interacting/interaction#embedding)                          | boolean \| `Embedding.Options` |      | `false` | 嵌套节点，默认禁用。                                                                              |
-| [connecting](/zh/docs/api/interacting/interaction#connecting)                        | `Connecting.Options` |      | { snap: false, ... } | 连线选项。                                                                                        |
-| [highlighting](/zh/docs/api/interacting/interaction#highlighting)                    | `Highlighting.Options` |      | {...}                                            | 高亮选项。                                                                                        |
-| [interacting](/zh/docs/api/interacting/interaction#interacting)                      | `Interacting.Options` |      | { edgeLabelMovable: false } | 定制节点和边的交互行为。                                                                          |
-| [magnetThreshold](/zh/docs/api/graph/view#magnetthreshold)                     | number \| 'onleave'            |      | `0` | 鼠标移动多少次后才触发连线，或者设置为 `'onleave'` 时表示鼠标移出元素时才触发连线。               |
-| [moveThreshold](/zh/docs/api/graph/view#movethreshold)                         | number                         |      | `0` | 触发 `'mousemove'` 事件之前，允许鼠标移动的次数。                                                 |
-| [clickThreshold](/zh/docs/api/graph/view#clickthreshold)                       | number                         |      | `0` | 当鼠标移动次数超过指定的数字时，将不触发鼠标点击事件。                                            |
-| [preventDefaultContextMenu](/zh/docs/api/graph/view#preventdefaultcontextmenu) | boolean                        |      | `true` | 是否禁用浏览器默认右键菜单。                                                                      |
-| [preventDefaultBlankAction](/zh/docs/api/graph/view#preventdefaultblankaction) | boolean                        |      | `true` | 在画布空白位置响应鼠标事件时，是否禁用鼠标默认行为。                                              |
-| [async](/zh/docs/api/graph/view#async)                                         | boolean                        |      | `true` | 是否异步渲染                                                                                      |
-| [virtual](/zh/docs/api/graph/view#virtual)                                     | boolean                        |      | `false` | 是否只渲染可视区域内容                                                                            |
-| [onPortRendered](/zh/docs/api/graph/view#onportrendered)                                     | (args: OnPortRenderedArgs) => void                        |      | - | 当某个连接桩渲染完成时触发的回调。                                                                            |
-| [onEdgeLabelRendered](/zh/docs/api/graph/view#onedgelabelrendered)                                     | (args: OnEdgeLabelRenderedArgs) => void                        |      | - | 当边的文本标签渲染完成时触发的回调。                                                                            |
-| [createCellView](/zh/docs/api/graph/view#createcellview)                                     | (this: Graph, cell: Cell) => CellView \| null \| undefined                        |      | - | 是自定义元素的视图。                                                                          |
+| 选项                                                                           | 类型                           | 必选 | 描述                                                                                              | 默认值                                            |
+| ------------------------------------------------------------------------------ | ------------------------------ | :--: | ------------------------------------------------------------------------------------------------- | ------------------------------------------------- |
+| containers                             | HTMLElement                    |  ✓   | 画布的容器。                                                                                      |                                                   |
+| width                                                                | number                         |      | 画布宽度，默认使用容器宽度。                                                                      | - |
+| height                                                              | number                         |      | 画布高度，默认使用容器高度。                                                                      | - |
+| scaling                                    | { min?: number, max?: number } |      | 画布的最小最大缩放级别。                                                                     | { min: 0.01, max: 16 } |
+| [autoResize](/zh/docs/tutorial/basic/graph#画布大小)                                                      | boolean \| Element \| Document |      | 是否监听容器大小改变，并自动更新画布大小。 | `false` |
+| [panning](/zh/docs/api/graph/panning)                                          | boolean \| `PanningManager.Options` |      | 画布是否可以拖拽平移，默认禁用。                                                                                  | `false` |
+| [mousewheel](/zh/docs/api/graph/mousewheel)                                    | boolean \| `MouseWheel.Options` |      | 鼠标滚轮缩放，默认禁用。                                                                          | `false` |
+| [grid](/zh/docs/api/graph/grid)                                                | boolean \| number \| `GridManager.Options` |      | 网格，默认使用 `10px` 的网格，但不绘制网格背景。                                                  | `false` |
+| [background](/zh/docs/api/graph/background)                                    | false \| `BackgroundManager.Options` |      | 背景，默认不绘制背景。                                                                            | `false` |
+| [translating](/zh/docs/api/interacting/interaction#translating)                        | `Translating.Options` |      | 限制节点移动。                                                                                        | { restrict: false }                                            |
+| [embedding](/zh/docs/api/interacting/interaction#embedding)                          | boolean \| `Embedding.Options` |      | 嵌套节点，默认禁用。                                                                              | `false` |
+| [connecting](/zh/docs/api/interacting/interaction#connecting)                        | `Connecting.Options` |      | 连线选项。                                                                                        | { snap: false, ... } |
+| [highlighting](/zh/docs/api/interacting/interaction#highlighting)                    | `Highlighting.Options` |      | 高亮选项。                                                                                        | {...}                                            |
+| [interacting](/zh/docs/api/interacting/interaction#interacting)                      | `Interacting.Options` |      | 定制节点和边的交互行为。                                                                          | { edgeLabelMovable: false } |
+| [magnetThreshold](/zh/docs/api/graph/view#magnetthreshold)                     | number \| 'onleave'            |      | 鼠标移动多少次后才触发连线，或者设置为 `'onleave'` 时表示鼠标移出元素时才触发连线。               | `0` |
+| [moveThreshold](/zh/docs/api/graph/view#movethreshold)                         | number                         |      | 触发 `'mousemove'` 事件之前，允许鼠标移动的次数。                                                 | `0` |
+| [clickThreshold](/zh/docs/api/graph/view#clickthreshold)                       | number                         |      | 当鼠标移动次数超过指定的数字时，将不触发鼠标点击事件。                                            | `0` |
+| [preventDefaultContextMenu](/zh/docs/api/graph/view#preventdefaultcontextmenu) | boolean                        |      | 是否禁用浏览器默认右键菜单。                                                                      | `true` |
+| [preventDefaultBlankAction](/zh/docs/api/graph/view#preventdefaultblankaction) | boolean                        |      | 在画布空白位置响应鼠标事件时，是否禁用鼠标默认行为。                                              | `true` |
+| [async](/zh/docs/api/graph/view#async)                                         | boolean                        |      | 是否异步渲染                                                                                      | `true` |
+| [virtual](/zh/docs/api/graph/view#virtual)                                     | boolean                        |      | 是否只渲染可视区域内容                                                                            | `false` |
+| [onPortRendered](/zh/docs/api/graph/view#onportrendered)                                     | (args: OnPortRenderedArgs) => void                        |      | 当某个连接桩渲染完成时触发的回调。                                                                            | - |
+| [onEdgeLabelRendered](/zh/docs/api/graph/view#onedgelabelrendered)                                     | (args: OnEdgeLabelRenderedArgs) => void                        |      | 当边的文本标签渲染完成时触发的回调。                                                                            | - |
+| [createCellView](/zh/docs/api/graph/view#createcellview)                                     | (this: Graph, cell: Cell) => CellView \| null \| undefined                        |      | 是自定义元素的视图。                                                                          | - |

sites/x6-sites/docs/api/interacting/interaction.zh.md

@@ -342,7 +342,7 @@ new Graph({
 
 上面 `magnetAvailable.name` 其实是高亮器的名称，X6 内置了 `stroke` 和 `className` 两种高亮器，详细信息参考 [Highlighter](/zh/docs/api/registry/highlighter)
 
-## trasnlating
+## translating
 
 可以在全局配置 `translating` 来限制节点的移动范围。
 

sites/x6-sites/docs/api/model/edge.zh.md

@@ -241,8 +241,9 @@ getBBox(): Rectangle
 
 返回边的包围盒。
 
-[[warning]]
+:::warning{title=注意：}
 | 需要注意的是，该方法通过边的端点和路径点计算包围盒，并不是渲染到画布后的包围盒，涉及的计算只是一些算数运算。
+:::
 
 #### getPolyline()
 

sites/x6-sites/docs/api/model/labels.zh.md

@@ -499,7 +499,7 @@ function parseStringLabel(label: string): Label {
 
 ```ts
 Edge.config({
-  defaultlabel: {
+  defaultLabel: {
     markup: [
       {
         tagName: "rect",

sites/x6-sites/docs/api/model/model.zh.md

@@ -716,7 +716,7 @@ toJSON(options?: ToJSONOptions): object
 
 | 名称         | 类型 | 必选 | 默认值  | 描述                                                                                                      |
 | ------------ | ---- | :--: | ------- | --------------------------------------------------------------------------------------------------------- |
-| options.deep | diff |      | `false` | 是否导出节点和边的差异数据（与节点和边的[默认配置](/zh/docs/tutorial/basic/cell#选项默认值)不同的部分）。 |
+| options.deep | diff |      | `false` | 是否导出节点和边的差异数据（与节点和边的[默认配置](/zh/docs/api/model/cell#选项默认值)不同的部分）。 |
 
 ### parseJSON(...)