From b40b9a42c2360de14dbd8520e3712cf65b481879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= <lihao.ylh@alibaba-inc.com>
Date: Fri, 15 May 2020 10:41:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20toolbar=20=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E4=BD=8D=E7=BD=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/builtin-simulator/bem-tools/border-selecting.tsx  | 8 +++++---
 .../src/builtin-simulator/node-selector/index.tsx         | 1 +
 packages/editor-skeleton/src/transducers/addon-combine.ts | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx
index faa11d4f3..78314cb5f 100644
--- a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx
+++ b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx
@@ -70,7 +70,6 @@ class Toolbar extends Component<{ observed: OffsetObserver }> {
     let style: any;
     if (observed.top > SPACE_HEIGHT) {
       style = {
-        right: Math.max(-BORDER, observed.right - width - BORDER),
         top: -SPACE_HEIGHT,
         height: BAR_HEIGHT,
       };
@@ -78,15 +77,18 @@ class Toolbar extends Component<{ observed: OffsetObserver }> {
       style = {
         bottom: -SPACE_HEIGHT,
         height: BAR_HEIGHT,
-        right: Math.max(-BORDER, observed.right - width - BORDER),
       };
     } else {
       style = {
         height: BAR_HEIGHT,
         top: Math.max(MARGIN, MARGIN - observed.top),
-        right: Math.max(MARGIN, MARGIN + observed.right - width),
       };
     }
+    if (observed.width < 140) {
+      style.left = Math.max(-BORDER, observed.left - width - BORDER);
+    } else {
+      style.right = Math.max(-BORDER, observed.right - width - BORDER);
+    }
     const { node } = observed;
     const actions: ReactNodeArray = [];
     node.componentMeta.availableActions.forEach((action) => {
diff --git a/packages/designer/src/builtin-simulator/node-selector/index.tsx b/packages/designer/src/builtin-simulator/node-selector/index.tsx
index f63f5c282..5d1118294 100644
--- a/packages/designer/src/builtin-simulator/node-selector/index.tsx
+++ b/packages/designer/src/builtin-simulator/node-selector/index.tsx
@@ -101,6 +101,7 @@ export default class InstanceNodeSelector extends React.Component<IProps, IState
             </div>
           }
           triggerType="hover"
+          offset={[0, 2]}
         >
           <div className="instance-node-selector">{this.renderNodes(node)}</div>
         </Popup>
diff --git a/packages/editor-skeleton/src/transducers/addon-combine.ts b/packages/editor-skeleton/src/transducers/addon-combine.ts
index 6c4015d14..1f7208547 100644
--- a/packages/editor-skeleton/src/transducers/addon-combine.ts
+++ b/packages/editor-skeleton/src/transducers/addon-combine.ts
@@ -194,7 +194,7 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp
   } else {
     combined.push({
       name: '#advanced',
-      title: { type: 'i18n', 'zh-CN': '高级', 'en-US': 'Advance' },
+      title: { type: 'i18n', 'zh-CN': '高级', 'en-US': 'Advanced' },
       items: [
         {
           name: '___condition',