event Handlers in Dropdown do not read current item variable correctly

raheeliftikhar5 · raheeliftikhar5 · commit 11c6dcdab761 · 2024-02-07T23:21:56.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/buttonComp/dropdownComp.tsx b/client/packages/lowcoder/src/comps/comps/buttonComp/dropdownComp.tsx
@@ -83,13 +83,16 @@ const DropdownTmpComp = (function () {
         key: option.label + " - " + index,
         disabled: option.disabled,
         icon: hasIcon && <span>{option.prefixIcon}</span>,
-        onEvent: option.onEvent,
+        index,
       }));
 
     const menu = (
       <Menu
         items={items}
-        onClick={({ key }) => items.find((o) => o.key === key)?.onEvent("click")}
+        onClick={({ key }) => {
+          const item = items.find((o) => o.key === key);
+          item && props.options[item.index]?.onEvent("click");
+        }}
       />
     );
 
diff --git a/client/packages/lowcoder/src/comps/controls/optionsControl.tsx b/client/packages/lowcoder/src/comps/controls/optionsControl.tsx
@@ -33,11 +33,12 @@ import {
 import styled from "styled-components";
 import { lastValueIfEqual } from "util/objectUtils";
 import { getNextEntityName } from "util/stringUtils";
-import { JSONValue } from "util/jsonTypes";
+import { JSONObject, JSONValue } from "util/jsonTypes";
 import { ButtonEventHandlerControl } from "./eventHandlerControl";
 import { ControlItemCompBuilder } from "comps/generators/controlCompBuilder";
 import { ColorControl } from "./colorControl";
 import { StringStateControl } from "./codeStateControl";
+import { reduceInContext } from "../utils/reduceContext";
 
 const OptionTypes = [
   {
@@ -312,8 +313,16 @@ export function mapOptionsControl<T extends OptionsControlType>(
     }
 
     override reduce(action: CompAction) {
-      const comp = super.reduce(action);
+      // TODO: temporary solution condition to fix context issue in dropdown option's events
+      if (
+        action.type === CompActionTypes.CUSTOM
+        && (action.value as JSONObject).type === 'actionTriggered'
+      ) {
+        const comp = reduceInContext({ inEventContext: true }, () => super.reduce(action));
+        return comp;
+      } else
       if (action.type === CompActionTypes.UPDATE_NODES_V2) {
+        const comp = super.reduce(action)
         if (comp.children.data !== this.children.data) {
           const sourceArray = comp.children.data.getView();
           const dataExample = sourceArray ? sourceArray[0] : undefined;
@@ -323,7 +332,7 @@ export function mapOptionsControl<T extends OptionsControlType>(
           }
         }
       }
-      return comp;
+      return super.reduce(action);
     }
 
     updateContext(dataExample: JSONValue) {
