Minor fixes and refactor out a method to check if ws should handle return

Author: RoboErikG

src/actions/clipboard.ts

@@ -207,9 +207,7 @@ export class Clipboard {
       !!this.oldCutShortcut?.callback &&
       this.oldCutShortcut.callback(workspace, e, shortcut, scope);
     if (didCut) {
-      this.copyWorkspace = workspace.isFlyout
-        ? workspace.targetWorkspace
-        : workspace;
+      this.copyWorkspace = workspace;
       showCutHint(workspace);
     }
     return didCut;

src/actions/enter.ts

@@ -56,9 +56,7 @@ export class EnterAction {
       preconditionFn: (workspace): boolean => {
         switch (this.navigation.getState()) {
           case Constants.STATE.WORKSPACE:
-            // The main workspace may or may not handle it depending on what's
-            // selected, so always pass it through to the callback.
-            return true;
+            return this.shouldHandleEnterForWS(workspace);
           case Constants.STATE.FLYOUT: {
             // If we're in the flyout the only supported actions are inserting
             // blocks or clicking buttons, so don't handle this if the
@@ -87,7 +85,6 @@ export class EnterAction {
           case Constants.STATE.WORKSPACE:
             return this.handleEnterForWS(workspace);
           case Constants.STATE.FLYOUT:
-            if (targetWorkspace.isReadOnly()) return false;
             flyoutCursor = this.navigation.getFlyoutCursor(targetWorkspace);
             if (!flyoutCursor) {
               return false;
@@ -107,6 +104,21 @@ export class EnterAction {
     });
   }
 
+  /**
+   * Checks if the enter key should do anything for this ws.
+   *
+   * @param workspace The workspace to check.
+   * @returns True if the enter action should be handled.
+   */
+  private shouldHandleEnterForWS(workspace: WorkspaceSvg): boolean {
+    const cursor = workspace.getCursor();
+    const curNode = cursor?.getCurNode();
+    if (!curNode) return false;
+    if (curNode instanceof Field && !curNode.isClickable()) return false;
+    // Returning true is sometimes incorrect for icons, but there's no API to check.
+    return true;
+  }
+
   /**
    * Handles hitting the enter key on the workspace.
    *
@@ -115,8 +127,7 @@ export class EnterAction {
    */
   private handleEnterForWS(workspace: WorkspaceSvg): boolean {
     const cursor = workspace.getCursor();
-    if (!cursor) return false;
-    const curNode = cursor.getCurNode();
+    const curNode = cursor?.getCurNode();
     if (!curNode) return false;
     if (curNode instanceof Field) {
       curNode.showEditor();
@@ -297,7 +308,7 @@ export class EnterAction {
     if (block.isSimpleReporter()) {
       for (const input of block.inputList) {
         for (const field of input.fieldRow) {
-          if (field.isFullBlockField()) {
+          if (field.isClickable() && field.isFullBlockField()) {
             field.showEditor();
             return true;
           }