From 080102db5b53b8052383dc3bcc6c6183ec084001 Mon Sep 17 00:00:00 2001
From: liujuping <liujup@foxmail.com>
Date: Tue, 13 Dec 2022 15:34:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/inner-plugins/builtin-hotkey.ts       | 19 ++++++++++---------
 packages/shell/src/node-children.ts           |  6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/engine/src/inner-plugins/builtin-hotkey.ts b/packages/engine/src/inner-plugins/builtin-hotkey.ts
index b42bc1d54..a3845a67a 100644
--- a/packages/engine/src/inner-plugins/builtin-hotkey.ts
+++ b/packages/engine/src/inner-plugins/builtin-hotkey.ts
@@ -1,3 +1,4 @@
+import { IPublicModelNode } from './../../../types/src/shell/model/node';
 import { Editor, globalContext } from '@alilc/lowcode-editor-core';
 import { isFormEvent } from '@alilc/lowcode-utils';
 import {
@@ -24,16 +25,16 @@ export function isInLiveEditing() {
 }
 
 /* istanbul ignore next */
-function getNextForSelect(next: any, head?: any, parent?: any): any {
+function getNextForSelect(next: IPublicModelNode | null, head?: any, parent?: IPublicModelNode | null): any {
   if (next) {
     if (!head) {
       return next;
     }
 
     let ret;
-    if (next.isContainer()) {
-      const children = next.getChildren() || [];
-      if (children && !children.isEmpty()) {
+    if (next.isContainer) {
+      const children = next.children;
+      if (children && !children.isEmpty) {
         ret = getNextForSelect(children.get(0));
         if (ret) {
           return ret;
@@ -48,19 +49,19 @@ function getNextForSelect(next: any, head?: any, parent?: any): any {
   }
 
   if (parent) {
-    return getNextForSelect(parent.nextSibling, false, parent.getParent());
+    return getNextForSelect(parent.nextSibling, false, parent?.parent);
   }
 
   return null;
 }
 
 /* istanbul ignore next */
-function getPrevForSelect(prev: any, head?: any, parent?: any): any {
+function getPrevForSelect(prev: IPublicModelNode | null, head?: any, parent?: IPublicModelNode | null): any {
   if (prev) {
     let ret;
-    if (!head && prev.isContainer()) {
-      const children = prev.getChildren() || [];
-      const lastChild = children && !children.isEmpty() ? children.get(children.size - 1) : null;
+    if (!head && prev.isContainer) {
+      const children = prev.children;
+      const lastChild = children && !children.isEmpty ? children.get(children.size - 1) : null;
 
       ret = getPrevForSelect(lastChild);
       if (ret) {
diff --git a/packages/shell/src/node-children.ts b/packages/shell/src/node-children.ts
index 9ff2f93b6..acaddb2bc 100644
--- a/packages/shell/src/node-children.ts
+++ b/packages/shell/src/node-children.ts
@@ -10,11 +10,11 @@ export default class NodeChildren implements IPublicModelNodeChildren {
     this[nodeChildrenSymbol] = nodeChildren;
   }
 
-  static create(nodeChldren: InnerNodeChildren | null): IPublicModelNodeChildren | null {
-    if (!nodeChldren) {
+  static create(nodeChildren: InnerNodeChildren | null): IPublicModelNodeChildren | null {
+    if (!nodeChildren) {
       return null;
     }
-    return new NodeChildren(nodeChldren);
+    return new NodeChildren(nodeChildren);
   }
 
   /**