From e2004a0c7972012e754d10b0facae782ae1b307e Mon Sep 17 00:00:00 2001
From: kangwei <bingbing.yb@alibaba-inc.com>
Date: Mon, 30 Mar 2020 17:41:31 +0800
Subject: [PATCH] chore: move setter to setters

---
 .../src/builtin-simulator/bem-tools/insertion.less    | 11 ++++++++---
 packages/designer/src/builtin-simulator/host.ts       |  2 ++
 packages/designer/src/designer/location.ts            |  2 +-
 .../setters => setters/src}/color-setter/index.scss   |  0
 .../setters => setters/src}/color-setter/index.tsx    |  0
 .../src}/expression-setter/index.scss                 |  0
 .../src}/expression-setter/index.tsx                  |  0
 .../src}/expression-setter/locale/snippets.js         |  0
 .../src}/expression-setter/locale/utils.js            |  0
 .../src}/expression-setter/locale/zh-CN.js            |  0
 .../setters => setters/src}/json-setter/index.scss    |  0
 .../src/setters => setters/src}/json-setter/index.tsx |  0
 .../src}/json-setter/locale/snippets.js               |  0
 .../src}/json-setter/locale/utils.js                  |  0
 .../src}/json-setter/locale/zh-CN.js                  |  0
 .../src/locale/snippets copy.js}                      |  0
 .../utils.js => setters/src/locale/utils copy.js}     |  0
 .../zh-CN.js => setters/src/locale/zh-CN copy.js}     |  0
 .../setters => setters/src}/mixin-setter/index.scss   |  0
 .../setters => setters/src}/mixin-setter/index.tsx    |  0
 .../src}/mixin-setter/locale/snippets.js              |  0
 .../src}/mixin-setter/locale/utils.js                 |  0
 .../src}/mixin-setter/locale/zh-CN.js                 |  0
 23 files changed, 11 insertions(+), 4 deletions(-)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/color-setter/index.scss (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/color-setter/index.tsx (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/expression-setter/index.scss (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/expression-setter/index.tsx (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/expression-setter/locale/snippets.js (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/expression-setter/locale/utils.js (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/expression-setter/locale/zh-CN.js (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/json-setter/index.scss (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/json-setter/index.tsx (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/json-setter/locale/snippets.js (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/json-setter/locale/utils.js (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/json-setter/locale/zh-CN.js (100%)
 rename packages/{plugin-settings-pane/src/setters/locale/snippets.js => setters/src/locale/snippets copy.js} (100%)
 rename packages/{plugin-settings-pane/src/setters/locale/utils.js => setters/src/locale/utils copy.js} (100%)
 rename packages/{plugin-settings-pane/src/setters/locale/zh-CN.js => setters/src/locale/zh-CN copy.js} (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/mixin-setter/index.scss (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/mixin-setter/index.tsx (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/mixin-setter/locale/snippets.js (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/mixin-setter/locale/utils.js (100%)
 rename packages/{plugin-settings-pane/src/setters => setters/src}/mixin-setter/locale/zh-CN.js (100%)

diff --git a/packages/designer/src/builtin-simulator/bem-tools/insertion.less b/packages/designer/src/builtin-simulator/bem-tools/insertion.less
index 8921e9334..19f4e5fa4 100644
--- a/packages/designer/src/builtin-simulator/bem-tools/insertion.less
+++ b/packages/designer/src/builtin-simulator/bem-tools/insertion.less
@@ -4,20 +4,25 @@
   left: 0;
   z-index: 12;
   pointer-events: none !important;
-  background-color: var(--color-brand-light);
-  height: 3px;
+  background-color: white;
+  height: 5px;
+  border: 2px solid var(--color-brand-light);
+  border-radius: 2px;
 
   &.cover {
     top: 0;
     height: auto;
     width: auto;
+    background-color: var(--color-brand-light);
+    border: none;
     opacity: 0.3;
+    border-radius: 0;
   }
 
   &.vertical {
     top: 0;
     left: -1.5px;
-    width: 3px;
+    width: 5px;
     height: auto;
   }
   &.invalid {
diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index b8fd42975..444697f24 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -786,6 +786,8 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       const inline = el ? isChildInline(el) : false;
       const row = el ? isRowContainer(el.parentElement!) : false;
       const vertical = inline || row;
+
+      console.info('mm', inline, vertical, row, el);
       // TODO: fix type
       const near: any = {
         node: nearNode,
diff --git a/packages/designer/src/designer/location.ts b/packages/designer/src/designer/location.ts
index eef13d10d..2c82891ca 100644
--- a/packages/designer/src/designer/location.ts
+++ b/packages/designer/src/designer/location.ts
@@ -86,7 +86,7 @@ export function isChildInline(child: Element | Text, win?: Window) {
     return true;
   }
   const style = (win || getWindow(child)).getComputedStyle(child);
-  return /^inline/.test(style.getPropertyValue('display'));
+  return /^inline/.test(style.getPropertyValue('display')) || /^(left|right)$/.test(style.getPropertyValue('float'));
 }
 
 export function getRectTarget(rect: Rect | null) {
diff --git a/packages/plugin-settings-pane/src/setters/color-setter/index.scss b/packages/setters/src/color-setter/index.scss
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/color-setter/index.scss
rename to packages/setters/src/color-setter/index.scss
diff --git a/packages/plugin-settings-pane/src/setters/color-setter/index.tsx b/packages/setters/src/color-setter/index.tsx
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/color-setter/index.tsx
rename to packages/setters/src/color-setter/index.tsx
diff --git a/packages/plugin-settings-pane/src/setters/expression-setter/index.scss b/packages/setters/src/expression-setter/index.scss
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/expression-setter/index.scss
rename to packages/setters/src/expression-setter/index.scss
diff --git a/packages/plugin-settings-pane/src/setters/expression-setter/index.tsx b/packages/setters/src/expression-setter/index.tsx
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/expression-setter/index.tsx
rename to packages/setters/src/expression-setter/index.tsx
diff --git a/packages/plugin-settings-pane/src/setters/expression-setter/locale/snippets.js b/packages/setters/src/expression-setter/locale/snippets.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/expression-setter/locale/snippets.js
rename to packages/setters/src/expression-setter/locale/snippets.js
diff --git a/packages/plugin-settings-pane/src/setters/expression-setter/locale/utils.js b/packages/setters/src/expression-setter/locale/utils.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/expression-setter/locale/utils.js
rename to packages/setters/src/expression-setter/locale/utils.js
diff --git a/packages/plugin-settings-pane/src/setters/expression-setter/locale/zh-CN.js b/packages/setters/src/expression-setter/locale/zh-CN.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/expression-setter/locale/zh-CN.js
rename to packages/setters/src/expression-setter/locale/zh-CN.js
diff --git a/packages/plugin-settings-pane/src/setters/json-setter/index.scss b/packages/setters/src/json-setter/index.scss
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/json-setter/index.scss
rename to packages/setters/src/json-setter/index.scss
diff --git a/packages/plugin-settings-pane/src/setters/json-setter/index.tsx b/packages/setters/src/json-setter/index.tsx
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/json-setter/index.tsx
rename to packages/setters/src/json-setter/index.tsx
diff --git a/packages/plugin-settings-pane/src/setters/json-setter/locale/snippets.js b/packages/setters/src/json-setter/locale/snippets.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/json-setter/locale/snippets.js
rename to packages/setters/src/json-setter/locale/snippets.js
diff --git a/packages/plugin-settings-pane/src/setters/json-setter/locale/utils.js b/packages/setters/src/json-setter/locale/utils.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/json-setter/locale/utils.js
rename to packages/setters/src/json-setter/locale/utils.js
diff --git a/packages/plugin-settings-pane/src/setters/json-setter/locale/zh-CN.js b/packages/setters/src/json-setter/locale/zh-CN.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/json-setter/locale/zh-CN.js
rename to packages/setters/src/json-setter/locale/zh-CN.js
diff --git a/packages/plugin-settings-pane/src/setters/locale/snippets.js b/packages/setters/src/locale/snippets copy.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/locale/snippets.js
rename to packages/setters/src/locale/snippets copy.js
diff --git a/packages/plugin-settings-pane/src/setters/locale/utils.js b/packages/setters/src/locale/utils copy.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/locale/utils.js
rename to packages/setters/src/locale/utils copy.js
diff --git a/packages/plugin-settings-pane/src/setters/locale/zh-CN.js b/packages/setters/src/locale/zh-CN copy.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/locale/zh-CN.js
rename to packages/setters/src/locale/zh-CN copy.js
diff --git a/packages/plugin-settings-pane/src/setters/mixin-setter/index.scss b/packages/setters/src/mixin-setter/index.scss
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/mixin-setter/index.scss
rename to packages/setters/src/mixin-setter/index.scss
diff --git a/packages/plugin-settings-pane/src/setters/mixin-setter/index.tsx b/packages/setters/src/mixin-setter/index.tsx
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/mixin-setter/index.tsx
rename to packages/setters/src/mixin-setter/index.tsx
diff --git a/packages/plugin-settings-pane/src/setters/mixin-setter/locale/snippets.js b/packages/setters/src/mixin-setter/locale/snippets.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/mixin-setter/locale/snippets.js
rename to packages/setters/src/mixin-setter/locale/snippets.js
diff --git a/packages/plugin-settings-pane/src/setters/mixin-setter/locale/utils.js b/packages/setters/src/mixin-setter/locale/utils.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/mixin-setter/locale/utils.js
rename to packages/setters/src/mixin-setter/locale/utils.js
diff --git a/packages/plugin-settings-pane/src/setters/mixin-setter/locale/zh-CN.js b/packages/setters/src/mixin-setter/locale/zh-CN.js
similarity index 100%
rename from packages/plugin-settings-pane/src/setters/mixin-setter/locale/zh-CN.js
rename to packages/setters/src/mixin-setter/locale/zh-CN.js