wip

bpmn-io · Sep 15, 2023 · 680a6e5 · 680a6e5
1 parent 5951d09
commit 680a6e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...decision-table/src/features/decision-rules/components/DecisionRulesCellEditorComponent.js b/...decision-table/src/features/decision-rules/components/DecisionRulesCellEditorComponent.js
@@ -83,24 +83,29 @@ class FeelEditor extends Component {
     this.state = { focussed: false };
 
     this.onFocus = this.onFocus.bind(this);
+    this.onBlur = this.onBlur.bind(this);
   }
 
   onFocus() {
     this.setState({ focussed: true });
   }
 
+  onBlur() {
+    this.setState({ focussed: false });
+  }
+
   render() {
     return <div onClick={ this.onFocus }>
       {this.state.focussed && (
         <LiteralExpression
           { ...this.props }
-
-          onBlur={ () => this.setState({ focussed: false }) }
+          autoFocus={ true }
+          onBlur={ this.onBlur }
         />
       )}
       {!this.state.focussed && (
         <div onFocus={ this.onFocus } tabIndex="0">
-          { this.props.value }
+          { this.props.value || this.props.placeholder || '' }
         </div>
       )}
     </div>;
@@ -201,15 +206,12 @@ class TableCellEditor extends Component {
           isString(description)
             && <div className="description-indicator"></div>
         }
-        {
-          placeholder && !value &&
-          <span className="cell-editor__placeholder">{ placeholder }</span>
-        }
         <Editor
           className={ isScript ? 'script-editor' : null }
           ctrlForNewline={ true }
           onInput={ onChange }
           value={ value }
+          placeholder={ placeholder }
         />
         {
           !isDefaultExpressionLanguage && (

diff --git a/packages/dmn-js-shared/src/components/LiteralExpression.js b/packages/dmn-js-shared/src/components/LiteralExpression.js
@@ -49,6 +49,10 @@ export default class LiteralExpression extends Component {
     });
 
     this.node.addEventListener('mousedown', this.handleMouseEvent);
+
+    if (this.props.autoFocus) {
+      this.editor.focus(this.state.value.length);
+    }
   }
 
   componentDidUpdate(prevProps) {