Fix text toolbar position (fix #201)

Opla · Mar 8, 2019 · 0ca725a · 0ca725a
1 parent 38da81d
commit 0ca725a
Show file tree

Hide file tree

Showing 6 changed files with 717 additions and 692 deletions.
diff --git a/front/src/shared/components/actionsItem.jsx b/front/src/shared/components/actionsItem.jsx
@@ -52,6 +52,7 @@ class ActionsItem extends Component {
         meta = (
           <ListItemMeta
             icon="add"
+            className="actionItemIcon"
             onClick={() => {
               this.props.onAddAction(action, isCondition);
             }}
@@ -60,7 +61,11 @@ class ActionsItem extends Component {
       }
     } else {
       meta = (
-        <ListItemMeta icon="remove" onClick={this.props.onDeleteActionClick} />
+        <ListItemMeta
+          icon="remove"
+          className="actionItemIcon"
+          onClick={this.props.onDeleteActionClick}
+        />
       );
     }
     let cl = " onFocusAction actionItem";
@@ -79,8 +84,9 @@ class ActionsItem extends Component {
           this.handleActionsEditableSelected(this.actionsEditableRef, index);
         }}
       >
+        <React.Fragment>{this.props.toolbox}</React.Fragment>
         <div
-          style={{ width: "100%" }}
+          style={{ width: "calc(100% - 28px)" }}
           ref={(r) => {
             this.ref = r;
           }}
@@ -145,6 +151,7 @@ ActionsItem.propTypes = {
   onDeleteActionClick: PropTypes.func,
   style: PropTypes.shape({}),
   className: PropTypes.string,
+  toolbox: PropTypes.node,
 };
 
 export default ActionsItem;
diff --git a/front/src/shared/components/actionsList.jsx b/front/src/shared/components/actionsList.jsx
@@ -71,23 +71,23 @@ class ActionsList extends Component {
     this.props.onDeleteActionClick(this.props.name, index);
   };
 
-  updateToolboxDisplay = () => {
-    if (this.selectedItemRef && this.selectedItemRef.ref && this.toolboxRef) {
-      const {
-        left,
-        top,
-        width,
-      } = this.selectedItemRef.ref.parentNode.getBoundingClientRect();
-      let adjustedLeft = left - 8;
-      if (adjustedLeft < 0) {
-        adjustedLeft = 0;
-      }
-      const adjustedTop = top - 36;
-      const adjustedWidth = width - 2;
-      const style = `left: ${adjustedLeft}px; top: ${adjustedTop}px; width: ${adjustedWidth}px;`;
-      this.toolboxRef.style = style;
-    }
-  };
+  // updateToolboxDisplay = () => {
+  //   if (this.selectedItemRef && this.selectedItemRef.ref && this.toolboxRef) {
+  //     const {
+  //       left,
+  //       top,
+  //       width,
+  //     } = this.selectedItemRef.ref.parentNode.getBoundingClientRect();
+  //     let adjustedLeft = left - 8;
+  //     if (adjustedLeft < 0) {
+  //       adjustedLeft = 0;
+  //     }
+  //     const adjustedTop = top - 36;
+  //     const adjustedWidth = width - 2;
+  //     const style = `left: ${adjustedLeft}px; top: ${adjustedTop}px; width: ${adjustedWidth}px;`;
+  //     this.toolboxRef.style = style;
+  //   }
+  // };
 
   render() {
     const {
@@ -108,21 +108,38 @@ class ActionsList extends Component {
       actions[0].type === "condition";
     // const isActionsString = !isActionsEmpty && !isActionsCondition;
     const editable = true;
-    let addContentClassname = "";
-    let isSelected = false;
+
+    const isInput = name === "input";
+    const isIntentOutputEmpty = !isInput && !(actions && actions.length > 0);
+    const toolbox = (
+      <div
+        className="actionstoolbox"
+        // ref={(r) => {
+        //   this.toolboxRef = r;
+        //   this.updateToolboxDisplay();
+        // }}
+      >
+        <ActionsToolbox
+          onChange={onChangeToolbox}
+          isInput={isInput}
+          condition={isIntentOutputEmpty}
+        />
+      </div>
+    );
+
+    let addContentClassname = "addActionItem";
+    let isAddContentSelected = false;
     if (this.props.selected === 0) {
-      addContentClassname = "selectedActionItem";
-      isSelected = true;
+      addContentClassname += " selectedActionItem";
+      isAddContentSelected = true;
     }
-    const selected = this.props.selected - 1;
-    addContentClassname = `addActionItem ${addContentClassname}`;
     const addContent = (
       <ActionsItem
         className={addContentClassname}
         containerName={name}
         action={newAction}
         editable={editable}
-        isSelected={isSelected}
+        isSelected={isAddContentSelected}
         onAddAction={(content, isCondition = false) => {
           this.handleAddNewAction(content, isCondition);
         }}
@@ -138,14 +155,15 @@ class ActionsList extends Component {
         ref={(r) => {
           if (this.props.selected === 0) {
             this.selectedItemRef = r;
-            this.updateToolboxDisplay();
+            // this.updateToolboxDisplay();
           }
         }}
+        toolbox={isAddContentSelected && toolbox}
       />
     );
+
     const s = {
-      overflowX: "hidden",
-      overflowY: "auto",
+      overflow: "hidden",
       margin: "0 8px 16px 8px",
     };
     if (actions && actions.length > 0) {
@@ -155,7 +173,7 @@ class ActionsList extends Component {
       contentList = (
         <List style={s}>
           {actionsDisplayed.map((action, index) => {
-            isSelected = isSelected || index === selected;
+            const selected = index === this.props.selected - 1;
             return (
               <ActionsItem
                 containerName={name}
@@ -175,14 +193,15 @@ class ActionsList extends Component {
                   this.handleDeleteClick(index);
                 }}
                 isCondition={isActionsCondition}
-                isSelected={index === selected}
-                className={index === selected ? "selectedActionItem" : null}
+                isSelected={selected}
+                className={selected ? "selectedActionItem" : null}
                 ref={(r) => {
                   if (index === selected) {
                     this.selectedItemRef = r;
-                    this.updateToolboxDisplay();
+                    // this.updateToolboxDisplay();
                   }
                 }}
+                toolbox={selected && toolbox}
               />
             );
           })}
@@ -218,34 +237,13 @@ class ActionsList extends Component {
         />
       </div>
     );
-    let toolbox = "";
-    if (isSelected) {
-      const isInput = name === "input";
-      const isIntentOutputEmpty = !isInput && !(actions && actions.length > 0);
-      toolbox = (
-        <div
-          className="actionstoolbox"
-          ref={(r) => {
-            this.toolboxRef = r;
-            this.updateToolboxDisplay();
-          }}
-        >
-          <ActionsToolbox
-            onChange={onChangeToolbox}
-            isInput={isInput}
-            condition={isIntentOutputEmpty}
-          />
-        </div>
-      );
-    }
     return (
       <ExpansionPanel
         label={title}
-        className="zui-color--white"
+        className="zui-color--white editItemContainer"
         style={{ margin: "12px" }}
         elevation={0}
       >
-        {toolbox}
         {addContent}
         {contentList}
       </ExpansionPanel>

diff --git a/front/src/shared/components/actionsToolbox.jsx b/front/src/shared/components/actionsToolbox.jsx
@@ -384,7 +384,7 @@ class ActionsToolbox extends Component {
         <div style={styleToolbarRight}>
           <Button
             onClick={(e) => {
-              e.preventDefault();
+              e.stopPropagation();
               this.props.onChange("unfocus");
             }}
           >