Commit7c55830

authored

Merge pull request#2006 from iamfaran/fix/event-context

[Fix]:#1970,#1984 event handler context

2 parentsae2422c +3ff5663 commit7c55830Copy full SHA for 7c55830

File tree

-13

lines changed

client/packages/lowcoder/src/comps/controls
- actionSelector
  - actionSelectorControl.tsx
- optionsControl.tsx

-13

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -249,11 +249,10 @@ function actionSelectorControl(needContext: boolean) {`
`249`	`249`	`constcondition=this.children.condition.getView();`
`250`	`250`	`constignored=getReduceContext().disableUpdateState\|\|(isConditionSet&&!condition);`
`251`	`251`	`constignorePromise=Promise.resolve();`
`252`		`-constrealNeedContext=needContext\|\|getReduceContext().inEventContext;`
`253`	`252`	`constactionPromise=()=>{`
`254`		`-//returnrealNeedContext ?action.value.func() : this.children.comp.getView()();`
`255`		`-// commenting because it's using old context for event handlers inside list/grid`
`256`		`-returnthis.children.comp.getView()();`
	`253`	`+returnaction.value.context&&action.value.func`
	`254`	`+ ?action.value.func()`
	`255`	`+ :this.children.comp.getView()();`
`257`	`256`	`};`
`258`	`257`	`handlePromiseAfterResult(action,ignored ?ignorePromise :actionPromise());`
`259`	`258`	`returnthis;`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ import { JSONObject, JSONValue } from "util/jsonTypes";`
`38`	`38`	`import{ButtonEventHandlerControl}from"./eventHandlerControl";`
`39`	`39`	`import{ControlItemCompBuilder}from"comps/generators/controlCompBuilder";`
`40`	`40`	`import{ColorControl}from"./colorControl";`
`41`		`-import{reduceInContext}from"../utils/reduceContext";`
	`41`	`+`
`42`	`42`	`import{BorderOuterOutlined}from"@ant-design/icons";`
`43`	`43`
`44`	`44`	`// Tag preset color options`
`@@ -334,14 +334,6 @@ export function mapOptionsControl<T extends OptionsControlType>(`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`overridereduce(action:CompAction){`
`337`		`-// TODO: temporary solution condition to fix context issue in dropdown option's events`
`338`		`-if(`
`339`		`-action.type===CompActionTypes.CUSTOM`
`340`		`-&&(action.valueasJSONObject).type==='actionTriggered'`
`341`		`-){`
`342`		`-constcomp=reduceInContext({inEventContext:true},()=>super.reduce(action));`
`343`		`-returncomp;`
`344`		`-}else`
`345`	`337`	`if(action.type===CompActionTypes.UPDATE_NODES_V2){`
`346`	`338`	`constcomp=super.reduce(action)`
`347`	`339`	`if(comp.children.data!==this.children.data){`

Comments

(0)