The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Keep JSX handlers when a clone replaces a remote element ref (#27366)
Raphaël Bosic40c92eb57fb
diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/__tests__/jsx-shared-helpers.spec.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/__tests__/jsx-shared-helpers.spec.tsindex b0482fcfd1c..2114ac1db35 100644--- a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/__tests__/jsx-shared-helpers.spec.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/__tests__/jsx-shared-helpers.spec.ts@@ -6,6 +6,7 @@ import jsxSharedHelpersSource from '@/cli/utilities/build/common/front-componentimport { type ClonedElement } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/cloned-element.type';import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { type RefCallback } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/ref-callback.type';import { type SyntheticLikeEvent } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/synthetic-like-event.type';type SharedHelpers = typeof JsxSharedHelpers;@@ -296,7 +297,7 @@ describe('jsx runtime shared helpers', () => {describe.each([{ runtimeName: 'React', readsElementRefFromVnode: false },{ runtimeName: 'Preact', readsElementRefFromVnode: true },- ])('nested clones in $runtimeName', ({ readsElementRefFromVnode }) => {+ ])('clones in $runtimeName', ({ readsElementRefFromVnode }) => {const toClonedElement = (elementRef: EventRef): ClonedElement =>readsElementRefFromVnode? { type: 'html-button', props: {}, ref: elementRef }@@ -332,6 +333,10 @@ describe('jsx runtime shared helpers', () => {}};+ const recordRefCall = (calls: string[], name: string) => () => {+ calls.push(name);+ };+it('should run the inner clone handlers before the handlers of a clone whose ref calls the element ref', () => {const sharedHelpers = loadSharedHelpers();const element = new EventTarget();@@ -653,5 +658,120 @@ describe('jsx runtime shared helpers', () => {expect(calls).toEqual(['middle', 'inner keydown', 'outer focus']);},);++ it.each([{ clearedValue: null }, { clearedValue: undefined }])(+ 'should keep only the element handlers that a clone overriding the ref does not set to $clearedValue',+ ({ clearedValue }) => {+ const sharedHelpers = loadSharedHelpers();+ const element = new EventTarget();+ const calls: string[] = [];++ const jsxRef = sharedHelpers.makeEventRef(+ {+ onClick: recordCall(calls, 'jsx click'),+ onKeyDown: recordCall(calls, 'jsx keydown'),+ },+ recordRefCall(calls, 'jsx ref'),+ 'jsx',+ );+ cloneElementRef(sharedHelpers, jsxRef, {+ ref: recordRefCall(calls, 'clone ref'),+ onClick: clearedValue,+ })(element);+ dispatchSyntheticLikeEvents(element, ['click', 'keydown']);++ expect(calls).toEqual(['clone ref', 'jsx keydown']);+ },+ );++ it('should keep the element handlers and drop its user ref when a clone clears the ref', () => {+ const sharedHelpers = loadSharedHelpers();+ const element = new EventTarget();+ const calls: string[] = [];++ const jsxRef = sharedHelpers.makeEventRef(+ { onClick: recordCall(calls, 'jsx click') },+ recordRefCall(calls, 'jsx ref'),+ 'jsx',+ );+ cloneElementRef(sharedHelpers, jsxRef, { ref: null })(element);+ dispatchSyntheticLikeEvents(element, ['click']);++ expect(calls).toEqual(['jsx click']);+ });++ it.each([+ {+ outerCloneDescription: 'sets no handler',+ outerCloneEventProps: {},+ expectedCalls: ['outer ref', 'jsx click', 'inner keydown'],+ },+ {+ outerCloneDescription: 'clears the element handler',+ outerCloneEventProps: { onClick: null },+ expectedCalls: ['outer ref', 'inner keydown'],+ },+ ])(+ 'should keep the element and inner clone handlers when an outer clone overriding the ref $outerCloneDescription',+ ({ outerCloneEventProps, expectedCalls }) => {+ const sharedHelpers = loadSharedHelpers();+ const element = new EventTarget();+ const calls: string[] = [];++ const jsxRef = sharedHelpers.makeEventRef(+ { onClick: recordCall(calls, 'jsx click') },+ recordRefCall(calls, 'jsx ref'),+ 'jsx',+ );+ const innerCloneRef = cloneElementRef(sharedHelpers, jsxRef, {+ onKeyDown: recordCall(calls, 'inner keydown'),+ });+ cloneElementRef(sharedHelpers, innerCloneRef, {+ ref: recordRefCall(calls, 'outer ref'),+ ...outerCloneEventProps,+ })(element);+ dispatchSyntheticLikeEvents(element, ['click', 'keydown']);++ expect(calls).toEqual(expectedCalls);+ },+ );++ it.each([+ { cloneRefDescription: 'the same ref', cloneRef: vi.fn<RefCallback>() },+ { cloneRefDescription: 'null', cloneRef: null },+ ])(+ 'should reuse one ref when clones of an element with handlers override its ref with $cloneRefDescription',+ ({ cloneRef }) => {+ const sharedHelpers = loadSharedHelpers();+ const jsxRef = sharedHelpers.makeEventRef(+ { onClick: vi.fn() },+ vi.fn<RefCallback>(),+ 'jsx',+ );++ expect(cloneElementRef(sharedHelpers, jsxRef, { ref: cloneRef })).toBe(+ cloneElementRef(sharedHelpers, jsxRef, {+ ref: cloneRef,+ 'data-render-count': 1,+ }),+ );+ },+ );++ it('should reuse the element ref when a clone neither adds handlers nor overrides the ref', () => {+ const sharedHelpers = loadSharedHelpers();+ const jsxRef = sharedHelpers.makeEventRef(+ { onClick: vi.fn() },+ vi.fn<RefCallback>(),+ 'jsx',+ );++ expect(+ cloneElementRef(sharedHelpers, jsxRef, {+ 'aria-label': 'Cloned',+ ref: undefined,+ }),+ ).toBe(jsxRef);+ });});});diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref-properties.type.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref-properties.type.tsindex 6df75ba99ee..48714e128c3 100644--- a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref-properties.type.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref-properties.type.ts@@ -1,10 +1,12 @@import { type EventHandlerSource } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handler-source.type';import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';export type EventRefProperties = {- _eventProps: EventHandlersByPropName;+ _eventHandlers: EventHandlersByPropName;_outerWinningCloneEvents: EventHandlersByPropName | null | undefined;- _userRef: UserRef;+ _innerRef: UserRef;_eventSource: EventHandlerSource;+ _lastInnerRefReplacement?: EventRef;};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref.tsindex eee70a8ea7d..6d1dcc0b075 100644--- a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref.ts@@ -31,9 +31,9 @@ export const createEventRef = (}return Object.assign(eventRef, {- _eventProps: events,+ _eventHandlers: events,_outerWinningCloneEvents: outerWinningCloneEvents,- _userRef: userRef,+ _innerRef: userRef,_eventSource: source,});};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-config-override-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-config-override-ref.tsdeleted file mode 100644index 396bdc9b25b..00000000000--- a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-config-override-ref.ts+++ /dev/null@@ -1,16 +0,0 @@-import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';--export const doesCloneConfigOverrideRef = (- config: ElementProps | null | undefined,- readsElementRefFromVnode: boolean,-) => {- if (config == null) {- return false;- }-- if (readsElementRefFromVnode) {- return !!config.ref;- }-- return config.ref !== undefined;-};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-replace-element-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-replace-element-ref.tsnew file mode 100644index 00000000000..1ce86a18c79--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-replace-element-ref.ts@@ -0,0 +1,11 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';+import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';++export const doesCloneReplaceElementRef = (+ cloneConfig: ElementProps,+ elementRef: UserRef,+) => {+ const cloneSetsRef = cloneConfig.ref !== undefined;+ const cloneRefDiffersFromElementRef = cloneConfig.ref !== elementRef;+ return cloneSetsRef && cloneRefDiffersFromElementRef;+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-set-or-clear-event-prop.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-set-or-clear-event-prop.tsnew file mode 100644index 00000000000..0f3c26b0e2f--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-set-or-clear-event-prop.ts@@ -0,0 +1,17 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';++export const doesCloneSetOrClearEventProp = (+ cloneConfig: ElementProps,+ eventPropName: string,+) => {+ const isEventPropInCloneConfig = eventPropName in cloneConfig;+ if (!isEventPropInCloneConfig) {+ return false;+ }++ const cloneEventPropValue = cloneConfig[eventPropName];+ const setsEventHandler = typeof cloneEventPropValue === 'function';+ const clearsEventHandler =+ cloneEventPropValue === null || cloneEventPropValue === undefined;+ return setsEventHandler || clearsEventHandler;+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/find-innermost-jsx-event-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/find-innermost-jsx-event-ref.tsnew file mode 100644index 00000000000..04457a16dfb--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/find-innermost-jsx-event-ref.ts@@ -0,0 +1,17 @@+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';+import { isCloneEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-clone-event-ref';+import { isJsxEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-ref';++export const findInnermostJsxEventRef = (ref: UserRef): EventRef | null => {+ let innerRef = ref;+ while (isCloneEventRef(innerRef)) {+ innerRef = innerRef._innerRef;+ }++ if (isJsxEventRef(innerRef)) {+ return innerRef;+ }++ return null;+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-clone-user-ref-with-element-jsx-event-handlers.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-clone-user-ref-with-element-jsx-event-handlers.tsnew file mode 100644index 00000000000..16ea953dff2--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-clone-user-ref-with-element-jsx-event-handlers.ts@@ -0,0 +1,47 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';+import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';+import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';+import { findInnermostJsxEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/find-innermost-jsx-event-ref';+import { getJsxEventPropNamesOverriddenByClone } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-jsx-event-prop-names-overridden-by-clone';+import { makeEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-event-ref';+import { omitEventHandlers } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/omit-event-handlers';+import { replaceJsxEventRefInnerRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/replace-jsx-event-ref-inner-ref';++export const getCloneUserRefWithElementJsxEventHandlers = ({+ elementRef,+ cloneConfig,+ eventHandlersSetByInnerClones,+}: {+ elementRef: UserRef;+ cloneConfig: ElementProps;+ eventHandlersSetByInnerClones: EventHandlersByPropName | null;+}): UserRef => {+ const cloneUserRef = cloneConfig.ref;+ const elementJsxEventRef = findInnermostJsxEventRef(elementRef);+ if (elementJsxEventRef === null) {+ return cloneUserRef;+ }++ const elementJsxEventHandlers = elementJsxEventRef._eventHandlers;+ const jsxEventPropNamesOverriddenByClone =+ getJsxEventPropNamesOverriddenByClone({+ jsxEventHandlers: elementJsxEventHandlers,+ cloneConfig,+ eventHandlersSetByInnerClones,+ });+ if (jsxEventPropNamesOverriddenByClone.length === 0) {+ return replaceJsxEventRefInnerRef(elementJsxEventRef, cloneUserRef);+ }++ const remainingJsxEventHandlers = omitEventHandlers(+ elementJsxEventHandlers,+ jsxEventPropNamesOverriddenByClone,+ );+ const hasRemainingJsxEventHandlers =+ Object.keys(remainingJsxEventHandlers).length > 0;+ return makeEventRef(+ hasRemainingJsxEventHandlers ? remainingJsxEventHandlers : null,+ cloneUserRef,+ 'jsx',+ );+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-jsx-event-prop-names-overridden-by-clone.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-jsx-event-prop-names-overridden-by-clone.tsnew file mode 100644index 00000000000..8caba676f9e--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-jsx-event-prop-names-overridden-by-clone.ts@@ -0,0 +1,20 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';+import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';+import { isJsxEventPropOverriddenByClone } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-prop-overridden-by-clone';++export const getJsxEventPropNamesOverriddenByClone = ({+ jsxEventHandlers,+ cloneConfig,+ eventHandlersSetByInnerClones,+}: {+ jsxEventHandlers: EventHandlersByPropName;+ cloneConfig: ElementProps;+ eventHandlersSetByInnerClones: EventHandlersByPropName | null;+}) =>+ Object.keys(jsxEventHandlers).filter((jsxEventPropName) =>+ isJsxEventPropOverriddenByClone({+ eventPropName: jsxEventPropName,+ cloneConfig,+ eventHandlersSetByInnerClones,+ }),+ );diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-outer-winning-clone-events-of.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-outer-winning-clone-events-of.tsindex fe5723dfedf..4c086d18297 100644--- a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-outer-winning-clone-events-of.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-outer-winning-clone-events-of.ts@@ -1,4 +1,4 @@import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';export const getOuterWinningCloneEventsOf = (cloneEventRef: EventRef) =>- cloneEventRef._outerWinningCloneEvents || cloneEventRef._eventProps;+ cloneEventRef._outerWinningCloneEvents || cloneEventRef._eventHandlers;diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-event-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-event-ref.tsnew file mode 100644index 00000000000..5cb6b609bbe--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-event-ref.ts@@ -0,0 +1,5 @@+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';++export const isEventRef = (ref: UserRef): ref is EventRef =>+ typeof ref === 'function' && ref._eventSource !== undefined;diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-prop-overridden-by-clone.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-prop-overridden-by-clone.tsnew file mode 100644index 00000000000..f4c8c8be4dd--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-prop-overridden-by-clone.ts@@ -0,0 +1,23 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';+import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';+import { doesCloneSetOrClearEventProp } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-set-or-clear-event-prop';++export const isJsxEventPropOverriddenByClone = ({+ eventPropName,+ cloneConfig,+ eventHandlersSetByInnerClones,+}: {+ eventPropName: string;+ cloneConfig: ElementProps;+ eventHandlersSetByInnerClones: EventHandlersByPropName | null;+}) => {+ if (doesCloneSetOrClearEventProp(cloneConfig, eventPropName)) {+ return true;+ }++ if (eventHandlersSetByInnerClones === null) {+ return false;+ }++ return eventPropName in eventHandlersSetByInnerClones;+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-ref.tsnew file mode 100644index 00000000000..20c5fbd48d0--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-jsx-event-ref.ts@@ -0,0 +1,5 @@+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';++export const isJsxEventRef = (ref: UserRef): ref is EventRef =>+ ref != null && ref._eventSource === 'jsx';diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-keeping-element-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-keeping-element-ref.tsnew file mode 100644index 00000000000..44fcd5e64e8--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-keeping-element-ref.ts@@ -0,0 +1,45 @@+import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { createEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref';+import { getOuterWinningCloneEventsOf } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-outer-winning-clone-events-of';+import { makeEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-event-ref';+import { mergeCloneEventsOuterWinning } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/merge-clone-events-outer-winning';+import { toNonEmptyCloneEventsOrNull } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/to-non-empty-clone-events-or-null';++export const makeCloneEventRefKeepingElementRef = ({+ innerCloneEventRef,+ cloneEvents,+}: {+ innerCloneEventRef: EventRef;+ cloneEvents: EventHandlersByPropName | null;+}): EventRef => {+ if (cloneEvents === null) {+ return innerCloneEventRef;+ }++ const outerWinningCloneEvents = toNonEmptyCloneEventsOrNull(+ mergeCloneEventsOuterWinning(+ getOuterWinningCloneEventsOf(innerCloneEventRef),+ cloneEvents,+ ),+ );+ const hasInnerOuterWinningCloneEvents =+ innerCloneEventRef._outerWinningCloneEvents != null;+ if (!hasInnerOuterWinningCloneEvents) {+ return makeEventRef(+ outerWinningCloneEvents,+ innerCloneEventRef._innerRef,+ 'clone',+ );+ }++ return createEventRef(+ mergeCloneEventsOuterWinning(+ innerCloneEventRef._eventHandlers,+ cloneEvents,+ ),+ innerCloneEventRef._innerRef,+ 'clone',+ outerWinningCloneEvents,+ );+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-replacing-element-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-replacing-element-ref.tsnew file mode 100644index 00000000000..117f527624a--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-replacing-element-ref.ts@@ -0,0 +1,45 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';+import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { chainCloneEvents } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/chain-clone-events';+import { createEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref';+import { getCloneUserRefWithElementJsxEventHandlers } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-clone-user-ref-with-element-jsx-event-handlers';+import { getOuterWinningCloneEventsOf } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-outer-winning-clone-events-of';+import { makeEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-event-ref';+import { mergeCloneEventsOuterWinning } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/merge-clone-events-outer-winning';+import { toNonEmptyCloneEventsOrNull } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/to-non-empty-clone-events-or-null';++export const makeCloneEventRefReplacingElementRef = ({+ innerCloneEventRef,+ cloneConfig,+ cloneEvents,+}: {+ innerCloneEventRef: EventRef;+ cloneConfig: ElementProps;+ cloneEvents: EventHandlersByPropName | null;+}): EventRef => {+ const eventHandlersSetByInnerClones =+ getOuterWinningCloneEventsOf(innerCloneEventRef);+ const cloneUserRef = getCloneUserRefWithElementJsxEventHandlers({+ elementRef: innerCloneEventRef,+ cloneConfig,+ eventHandlersSetByInnerClones,+ });+ const chainedCloneEvents = chainCloneEvents(+ innerCloneEventRef._eventHandlers,+ cloneEvents,+ );+ if (chainedCloneEvents === null) {+ return makeEventRef(null, cloneUserRef, 'clone');+ }++ const outerWinningCloneEvents = toNonEmptyCloneEventsOrNull(+ mergeCloneEventsOuterWinning(eventHandlersSetByInnerClones, cloneEvents),+ );+ return createEventRef(+ chainedCloneEvents,+ cloneUserRef,+ 'clone',+ outerWinningCloneEvents,+ );+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-without-inner-clone.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-without-inner-clone.tsnew file mode 100644index 00000000000..a7f19473ad3--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-without-inner-clone.ts@@ -0,0 +1,33 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';+import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';+import { getCloneUserRefWithElementJsxEventHandlers } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-clone-user-ref-with-element-jsx-event-handlers';+import { isEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-event-ref';+import { makeEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-event-ref';++export const makeCloneEventRefWithoutInnerClone = ({+ elementRef,+ cloneConfig,+ replacesElementRef,+ cloneEvents,+}: {+ elementRef: UserRef;+ cloneConfig: ElementProps;+ replacesElementRef: boolean;+ cloneEvents: EventHandlersByPropName | null;+}): EventRef => {+ const cloneUserRef = replacesElementRef+ ? getCloneUserRefWithElementJsxEventHandlers({+ elementRef,+ cloneConfig,+ eventHandlersSetByInnerClones: null,+ })+ : elementRef;+ const cloneAddsNoEventHandlers = cloneEvents === null;+ if (cloneAddsNoEventHandlers && isEventRef(cloneUserRef)) {+ return cloneUserRef;+ }++ return makeEventRef(cloneEvents, cloneUserRef, 'clone');+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref.tsindex cdce9753625..5afb74f3b24 100644--- a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref.ts@@ -1,62 +1,42 @@+import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';-import { chainCloneEvents } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/chain-clone-events';-import { createEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref';-import { getOuterWinningCloneEventsOf } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-outer-winning-clone-events-of';import { isCloneEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/is-clone-event-ref';-import { makeEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-event-ref';-import { mergeCloneEventsOuterWinning } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/merge-clone-events-outer-winning';-import { toNonEmptyCloneEventsOrNull } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/to-non-empty-clone-events-or-null';+import { makeCloneEventRefKeepingElementRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-keeping-element-ref';+import { makeCloneEventRefReplacingElementRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-replacing-element-ref';+import { makeCloneEventRefWithoutInnerClone } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref-without-inner-clone';export const makeCloneEventRef = ({elementRef,- configRef,- overridesElementRef,+ cloneConfig,+ replacesElementRef,cloneEvents,}: {elementRef: UserRef;- configRef: UserRef;- overridesElementRef: boolean;+ cloneConfig: ElementProps;+ replacesElementRef: boolean;cloneEvents: EventHandlersByPropName | null;}): EventRef => {if (!isCloneEventRef(elementRef)) {- const cloneUserRef = overridesElementRef ? configRef : elementRef;- return makeEventRef(cloneEvents, cloneUserRef, 'clone');- }-- const innerCloneEvents = elementRef._eventProps;- const outerWinningCloneEvents = toNonEmptyCloneEventsOrNull(- mergeCloneEventsOuterWinning(- getOuterWinningCloneEventsOf(elementRef),+ return makeCloneEventRefWithoutInnerClone({+ elementRef,+ cloneConfig,+ replacesElementRef,cloneEvents,- ),- );- const keepsInnerCloneUserRef =- !overridesElementRef || configRef === elementRef;- const hasInnerOuterWinningCloneEvents = !!elementRef._outerWinningCloneEvents;- if (keepsInnerCloneUserRef && !hasInnerOuterWinningCloneEvents) {- return makeEventRef(outerWinningCloneEvents, elementRef._userRef, 'clone');+ });}- if (keepsInnerCloneUserRef) {- return createEventRef(- mergeCloneEventsOuterWinning(innerCloneEvents, cloneEvents),- elementRef._userRef,- 'clone',- outerWinningCloneEvents,- );- }-- const chainedCloneEvents = chainCloneEvents(innerCloneEvents, cloneEvents);- if (chainedCloneEvents === null) {- return makeEventRef(null, configRef, 'clone');+ if (replacesElementRef) {+ return makeCloneEventRefReplacingElementRef({+ innerCloneEventRef: elementRef,+ cloneConfig,+ cloneEvents,+ });}- return createEventRef(- chainedCloneEvents,- configRef,- 'clone',- outerWinningCloneEvents,- );+ return makeCloneEventRefKeepingElementRef({+ innerCloneEventRef: elementRef,+ cloneEvents,+ });};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/omit-event-handlers.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/omit-event-handlers.tsnew file mode 100644index 00000000000..cfa025fbcbe--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/omit-event-handlers.ts@@ -0,0 +1,15 @@+import { type EventHandlersByPropName } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-handlers-by-prop-name.type';++export const omitEventHandlers = (+ eventHandlers: EventHandlersByPropName,+ omittedEventPropNames: string[],+) => {+ const remainingEventHandlers: EventHandlersByPropName = {};+ for (const [eventPropName, eventHandler] of Object.entries(eventHandlers)) {+ const isOmitted = omittedEventPropNames.includes(eventPropName);+ if (!isOmitted) {+ remainingEventHandlers[eventPropName] = eventHandler;+ }+ }+ return remainingEventHandlers;+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/replace-jsx-event-ref-inner-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/replace-jsx-event-ref-inner-ref.tsnew file mode 100644index 00000000000..49e73e25734--- /dev/null+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/replace-jsx-event-ref-inner-ref.ts@@ -0,0 +1,24 @@+import { type EventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/event-ref.type';+import { type UserRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/user-ref.type';+import { createEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/create-event-ref';++export const replaceJsxEventRefInnerRef = (+ jsxEventRef: EventRef,+ innerRef: UserRef,+): EventRef => {+ const lastInnerRefReplacement = jsxEventRef._lastInnerRefReplacement;+ const canReuseLastInnerRefReplacement =+ lastInnerRefReplacement !== undefined &&+ lastInnerRefReplacement._innerRef === innerRef;+ if (canReuseLastInnerRefReplacement) {+ return lastInnerRefReplacement;+ }++ const innerRefReplacement = createEventRef(+ jsxEventRef._eventHandlers,+ innerRef,+ 'jsx',+ );+ jsxEventRef._lastInnerRefReplacement = innerRefReplacement;+ return innerRefReplacement;+};diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/with-clone-event-ref.ts b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/with-clone-event-ref.tsindex 239b3b5eead..914acfe971c 100644--- a/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/with-clone-event-ref.ts+++ b/packages/twenty-sdk/src/cli/utilities/build/common/front-component-build/jsx-runtime/utils/with-clone-event-ref.ts@@ -1,6 +1,6 @@import { type ClonedElement } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/cloned-element.type';import { type ElementProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/types/element-props.type';-import { doesCloneConfigOverrideRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-config-override-ref';+import { doesCloneReplaceElementRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/does-clone-replace-element-ref';import { getElementRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/get-element-ref';import { makeCloneEventRef } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/make-clone-event-ref';import { splitEventProps } from '@/cli/utilities/build/common/front-component-build/jsx-runtime/utils/split-event-props';@@ -10,16 +10,15 @@ export const withCloneEventRef = (config: ElementProps | null | undefined,readsElementRefFromVnode: boolean,) => {- const { cleanProps: cleanConfig, events: cloneEvents } =- splitEventProps(config);- return Object.assign(cleanConfig, {+ const cloneConfig: ElementProps = config ?? {};+ const { cleanProps: cleanCloneConfig, events: cloneEvents } =+ splitEventProps(cloneConfig);+ const elementRef = getElementRef(element, readsElementRefFromVnode);+ return Object.assign(cleanCloneConfig, {ref: makeCloneEventRef({- elementRef: getElementRef(element, readsElementRefFromVnode),- configRef: config == null ? undefined : config.ref,- overridesElementRef: doesCloneConfigOverrideRef(- config,- readsElementRefFromVnode,- ),+ elementRef,+ cloneConfig,+ replacesElementRef: doesCloneReplaceElementRef(cloneConfig, elementRef),cloneEvents,}),});