feat: bye bye actions (#957)

AmadeusITGroup · Oct 18, 2024 · 59853ba · 59853ba
1 parent c718381
commit 59853ba
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 72 deletions.
diff --git a/angular/bootstrap/src/config.ts b/angular/bootstrap/src/config.ts
@@ -16,7 +16,7 @@ const widgetFactories: {
 	provideWidgetsConfig: (adaptParentConfig?: AdaptParentConfig) => FactoryProvider;
 	injectWidgetConfig: <N extends keyof BootstrapWidgetsConfig>(widgetName: N) => ReadableSignal<Partial<WidgetsConfig[N]> | undefined>;
 	injectWidgetsConfig: InjectWidgetsConfig;
-	callWidgetFactory: <W extends Widget<object, object, object, object, object>>({
+	callWidgetFactory: <W extends Widget<object, object, object, object>>({
 		factory,
 		widgetName,
 		defaultConfig,

diff --git a/angular/headless/src/utils/widget.spec.ts b/angular/headless/src/utils/widget.spec.ts
@@ -33,12 +33,11 @@ describe('callWidgetFactoryWithConfig', () => {
 			{onMyAction: () => void; onCounterChange: (value: number) => void; myValue: string},
 			{derivedValue: string; counter: number},
 			{myApiFn: () => void; incrementCounter: () => void},
-			{myAction: () => void},
 			{myDirective: Directive}
 		>;
 
 		const factory: WidgetFactory<MyWidget> = createZoneCheckFn('factory', (propsConfig) => {
-			const [{onMyAction$, onCounterChange$, myValue$}, patch] = writablesForProps(
+			const [{onCounterChange$, myValue$}, patch] = writablesForProps(
 				{
 					onMyAction: noop,
 					onCounterChange: noop,
@@ -65,11 +64,6 @@ describe('callWidgetFactoryWithConfig', () => {
 						onCounterChange$()(value);
 					}),
 				},
-				actions: {
-					myAction: createZoneCheckFn('myAction', () => {
-						onMyAction$()();
-					}),
-				},
 				directives: {
 					myDirective: createZoneCheckFn('myDirective', () => ({
 						update: createZoneCheckFn('myDirectiveUpdate', noop),
@@ -103,8 +97,6 @@ describe('callWidgetFactoryWithConfig', () => {
 					onMyAction: () => this.myAction.emit(),
 				},
 			});
-
-			onClick = createZoneCheckFn('onClick', () => this._widget.actions.myAction());
 		}
 
 		const ngZone = TestBed.inject(NgZone);
@@ -175,12 +167,6 @@ describe('callWidgetFactoryWithConfig', () => {
 			'after ngZone.run',
 			'before click',
 			'enter ngZone',
-			'begin onClick, ngZone = true',
-			'begin myAction, ngZone = false',
-			'begin myActionListener, ngZone = true',
-			'end myActionListener, ngZone = true',
-			'end myAction, ngZone = false',
-			'end onClick, ngZone = true',
 			'leave ngZone',
 			'after click',
 			'before incrementCounter',
@@ -201,7 +187,7 @@ describe('callWidgetFactoryWithConfig', () => {
 	});
 
 	it('calls the core with the correct init values', () => {
-		type MyWidget = Widget<{myValue: string}, {myValue: string}, Record<string, never>, Record<string, never>, Record<string, never>>;
+		type MyWidget = Widget<{myValue: string}, {myValue: string}, Record<string, never>, Record<string, never>>;
 
 		const factory: WidgetFactory<MyWidget> = (propsConfig) => {
 			const [{myValue$}, patch] = writablesForProps(
@@ -219,7 +205,6 @@ describe('callWidgetFactoryWithConfig', () => {
 					myValue$,
 				}),
 				api: {},
-				actions: {},
 				directives: {},
 				patch,
 			};

diff --git a/angular/headless/src/utils/widget.ts b/angular/headless/src/utils/widget.ts
@@ -86,7 +86,6 @@ export const callWidgetFactoryWithConfig = <W extends Widget>({
 					...widget,
 					patch: zoneWrapper.outsideNgZone(widget.patch),
 					directives: zoneWrapper.outsideNgZoneWrapDirectivesObject(widget.directives),
-					actions: zoneWrapper.outsideNgZoneWrapFunctionsObject(widget.actions),
 					api: zoneWrapper.outsideNgZoneWrapFunctionsObject(widget.api),
 				};
 				Object.assign(res, wrappedWidget, {

diff --git a/core-bootstrap/src/components/accordion/accordion.ts b/core-bootstrap/src/components/accordion/accordion.ts
@@ -70,12 +70,12 @@ export interface AccordionProps extends CoreProps, AccordionExtraProps {
 	itemTransition: TransitionFn;
 }
 
-export type AccordionWidget = Widget<AccordionProps, AccordionState, AccordionApi, object, AccordionDirectives>;
+export type AccordionWidget = Widget<AccordionProps, AccordionState, AccordionApi, AccordionDirectives>;
 
 export interface AccordionItemState extends CoreItemState, AccordionItemExtraProps {}
 export interface AccordionItemProps extends CoreItemProps, AccordionItemExtraProps {}
 
-export type AccordionItemWidget = Widget<AccordionItemProps, AccordionItemState, AccordionItemApi, object, AccordionItemDirectives>;
+export type AccordionItemWidget = Widget<AccordionItemProps, AccordionItemState, AccordionItemApi, AccordionItemDirectives>;
 
 const defaultConfigExtraProps: AccordionExtraProps = {
 	itemStructure: undefined,

diff --git a/core-bootstrap/src/components/alert/alert.ts b/core-bootstrap/src/components/alert/alert.ts
@@ -40,7 +40,7 @@ export interface AlertProps extends CoreProps, AlertExtraProps {
 	transition: TransitionFn;
 }
 
-export type AlertWidget = Widget<AlertProps, AlertState, AlertApi, object, AlertDirectives>;
+export type AlertWidget = Widget<AlertProps, AlertState, AlertApi, AlertDirectives>;
 
 const defaultConfigExtraProps: AlertExtraProps = {
 	structure: undefined,

diff --git a/core-bootstrap/src/components/collapse/collapse.ts b/core-bootstrap/src/components/collapse/collapse.ts
@@ -103,7 +103,7 @@ export interface CollapseDirectives {
 	transitionDirective: Directive;
 }
 
-export type CollapseWidget = Widget<CollapseProps, CollapseState, CollapseApi, object, CollapseDirectives>;
+export type CollapseWidget = Widget<CollapseProps, CollapseState, CollapseApi, CollapseDirectives>;
 
 const defaultCollapseConfig: CollapseProps = {
 	visible: true,
@@ -164,6 +164,5 @@ export function createCollapse(config?: PropsConfig<CollapseProps>): CollapseWid
 		directives: {
 			transitionDirective: bindDirectiveNoArg(transition.directives.directive),
 		},
-		actions: {},
 	};
 }
diff --git a/core-bootstrap/src/components/modal/modal.ts b/core-bootstrap/src/components/modal/modal.ts
@@ -72,7 +72,7 @@ export interface ModalApi<Data> extends Omit<CoreApi, 'patch'> {
 	patch: ModalWidget<Data>['patch'];
 }
 
-export type ModalWidget<Data> = Widget<ModalProps<Data>, ModalState<Data>, ModalApi<Data>, object, ModalDirectives>;
+export type ModalWidget<Data> = Widget<ModalProps<Data>, ModalState<Data>, ModalApi<Data>, ModalDirectives>;
 
 const defaultConfigExtraProps: ModalExtraProps<any> = {
 	contentData: undefined,

diff --git a/core-bootstrap/src/components/pagination/pagination.ts b/core-bootstrap/src/components/pagination/pagination.ts
@@ -104,7 +104,7 @@ interface PaginationExtraProps {
 export interface PaginationState extends CoreState, PaginationExtraProps {}
 export interface PaginationProps extends CoreProps, PaginationExtraProps {}
 
-export type PaginationWidget = Widget<PaginationProps, PaginationState, PaginationApi, object, PaginationDirectives>;
+export type PaginationWidget = Widget<PaginationProps, PaginationState, PaginationApi, PaginationDirectives>;
 
 const defaultConfigExtraProps: PaginationExtraProps = {
 	structure: undefined,

diff --git a/core-bootstrap/src/components/progressbar/progressbar.ts b/core-bootstrap/src/components/progressbar/progressbar.ts
@@ -46,7 +46,7 @@ interface ProgressbarExtraProps {
 export interface ProgressbarState extends CoreState, ProgressbarExtraProps {}
 export interface ProgressbarProps extends CoreProps, ProgressbarExtraProps {}
 
-export type ProgressbarWidget = Widget<ProgressbarProps, ProgressbarState, object, object, ProgressbarDirectives>;
+export type ProgressbarWidget = Widget<ProgressbarProps, ProgressbarState, object, ProgressbarDirectives>;
 
 const defaultConfigExtraProps: ProgressbarExtraProps = {
 	structure: undefined,

diff --git a/core-bootstrap/src/components/rating/rating.ts b/core-bootstrap/src/components/rating/rating.ts
@@ -20,7 +20,7 @@ interface RatingExtraProps {
 export interface RatingState extends CoreState, RatingExtraProps {}
 export interface RatingProps extends CoreProps, RatingExtraProps {}
 
-export type RatingWidget = Widget<RatingProps, RatingState, RatingApi, object, RatingDirectives>;
+export type RatingWidget = Widget<RatingProps, RatingState, RatingApi, RatingDirectives>;
 
 const defaultConfigExtraProps: RatingExtraProps = {
 	star: ({fill}: StarContext) => String.fromCharCode(fill === 100 ? 9733 : 9734),

diff --git a/core-bootstrap/src/components/select/select.ts b/core-bootstrap/src/components/select/select.ts
@@ -44,7 +44,7 @@ interface SelectExtraProps<Item> {
 export interface SelectState<Item> extends CoreState<Item>, SelectExtraProps<Item> {}
 export interface SelectProps<Item> extends CoreProps<Item>, SelectExtraProps<Item> {}
 
-export type SelectWidget<Item> = Widget<SelectProps<Item>, SelectState<Item>, SelectApi<Item>, object, SelectDirectives<Item>>;
+export type SelectWidget<Item> = Widget<SelectProps<Item>, SelectState<Item>, SelectApi<Item>, SelectDirectives<Item>>;
 
 const defaultConfigExtraProps: SelectExtraProps<any> = {
 	badgeLabel: ({itemContext}: SelectItemContext<any>) => itemContext.item,

diff --git a/core-bootstrap/src/components/slider/slider.ts b/core-bootstrap/src/components/slider/slider.ts
@@ -34,7 +34,7 @@ interface SliderExtraProps {
 export interface SliderState extends CoreState, SliderExtraProps {}
 export interface SliderProps extends CoreProps, SliderExtraProps {}
 
-export type SliderWidget = Widget<SliderProps, SliderState, object, object, SliderDirectives>;
+export type SliderWidget = Widget<SliderProps, SliderState, object, SliderDirectives>;
 
 const defaultConfigExtraProps: SliderExtraProps = {
 	structure: undefined,

diff --git a/core-bootstrap/src/components/toast/toast.ts b/core-bootstrap/src/components/toast/toast.ts
@@ -36,7 +36,7 @@ export interface ToastProps extends CoreProps, ToastExtraProps {
 	transition: TransitionFn;
 }
 
-export type ToastWidget = Widget<ToastProps, ToastState, ToastApi, object, ToastDirectives>;
+export type ToastWidget = Widget<ToastProps, ToastState, ToastApi, ToastDirectives>;
 
 const defaultConfigExtraProps: ToastExtraProps = {
 	structure: undefined,

diff --git a/core/src/components/accordion/accordion.ts b/core/src/components/accordion/accordion.ts
@@ -170,7 +170,7 @@ export interface AccordionDirectives {
 	accordionDirective: Directive;
 }
 
-export type AccordionWidget = Widget<AccordionProps, AccordionState, AccordionApi, object, AccordionDirectives>;
+export type AccordionWidget = Widget<AccordionProps, AccordionState, AccordionApi, AccordionDirectives>;
 
 export interface AccordionItemApi {
 	/**
@@ -304,7 +304,7 @@ export interface AccordionItemState extends AccordionItemCommonPropsAndState {
 	shouldBeInDOM: boolean;
 }
 
-export type AccordionItemWidget = Widget<AccordionItemProps, AccordionItemState, AccordionItemApi, object, AccordionItemDirectives>;
+export type AccordionItemWidget = Widget<AccordionItemProps, AccordionItemState, AccordionItemApi, AccordionItemDirectives>;
 
 const defaultAccordionConfig: AccordionProps = {
 	closeOthers: false,
@@ -482,7 +482,6 @@ export function createAccordionItem(config?: PropsConfig<AccordionItemProps>): A
 				visible$.update((c: boolean) => !c);
 			},
 		},
-		actions: {},
 		directives: {
 			toggleDirective,
 			buttonDirective: mergeDirectives(
@@ -552,7 +551,6 @@ export function factoryCreateAccordion(
 		return {
 			...stateStores({itemWidgets$, className$}),
 			patch,
-			actions: {},
 			api: {
 				expand: (id: string) => {
 					getItem(itemWidgets$(), id)?.api.expand();

diff --git a/core/src/components/alert/alert.ts b/core/src/components/alert/alert.ts
@@ -6,7 +6,7 @@ export interface AlertState extends CommonAlertState {}
 export interface AlertProps extends CommonAlertProps {}
 export interface AlertApi extends CommonAlertApi {}
 export interface AlertDirectives extends CommonAlertDirectives {}
-export type AlertWidget = Widget<AlertProps, AlertState, AlertApi, object, AlertDirectives>;
+export type AlertWidget = Widget<AlertProps, AlertState, AlertApi, AlertDirectives>;
 
 /**
  * Retrieve a shallow copy of the default alert config

diff --git a/core/src/components/alert/common.ts b/core/src/components/alert/common.ts
@@ -119,7 +119,7 @@ export interface CommonAlertDirectives {
 	transitionDirective: Directive;
 }
 
-export type CommonAlertWidget = Widget<CommonAlertProps, CommonAlertState, CommonAlertApi, object, CommonAlertDirectives>;
+export type CommonAlertWidget = Widget<CommonAlertProps, CommonAlertState, CommonAlertApi, CommonAlertDirectives>;
 
 const defaultCommonAlertConfig: CommonAlertProps = {
 	visible: true,
@@ -191,6 +191,5 @@ export function createCommonAlert(config?: PropsConfig<CommonAlertProps>): Commo
 		directives: {
 			transitionDirective: bindDirectiveNoArg(transition.directives.directive),
 		},
-		actions: {},
 	};
 }
diff --git a/core/src/components/modal/modal.ts b/core/src/components/modal/modal.ts
@@ -274,7 +274,7 @@ export interface ModalDirectives {
 /**
  * Modal widget.
  */
-export type ModalWidget = Widget<ModalProps, ModalState, ModalApi, object, ModalDirectives>;
+export type ModalWidget = Widget<ModalProps, ModalState, ModalApi, ModalDirectives>;
 
 const defaultConfig: ModalProps = {
 	animated: true,
@@ -507,7 +507,6 @@ export function createModal(config$?: PropsConfig<ModalProps>): ModalWidget {
 			},
 			patch,
 		},
-		actions: {},
 	};
 
 	return res;

diff --git a/core/src/components/pagination/pagination.ts b/core/src/components/pagination/pagination.ts
@@ -325,7 +325,7 @@ export interface PaginationDirectives {
 	pageLast: Directive;
 }
 
-export type PaginationWidget = Widget<PaginationProps, PaginationState, PaginationApi, object, PaginationDirectives>;
+export type PaginationWidget = Widget<PaginationProps, PaginationState, PaginationApi, PaginationDirectives>;
 
 const PAGE_LINK_DEFAULT = '#';
 
@@ -493,7 +493,6 @@ export function createPagination(config?: PropsConfig<PaginationProps>): Paginat
 			...stateProps,
 		}),
 		patch,
-		actions: {},
 		api: {
 			/**
 			 * Set the current page pageNumber (starting from 1)

diff --git a/core/src/components/progressbar/progressbar.ts b/core/src/components/progressbar/progressbar.ts
@@ -74,7 +74,7 @@ export interface ProgressbarProps extends ProgressbarCommonPropsAndState {
 	ariaValueTextFn: (value: number, minimum: number, maximum: number) => string | undefined;
 }
 
-export type ProgressbarWidget = Widget<ProgressbarProps, ProgressbarState, object, object, ProgressbarDirectives>;
+export type ProgressbarWidget = Widget<ProgressbarProps, ProgressbarState, object, ProgressbarDirectives>;
 
 const defaultConfig: ProgressbarProps = {
 	min: 0,
@@ -163,6 +163,5 @@ export function createProgressbar(config?: PropsConfig<ProgressbarProps>): Progr
 				},
 			})),
 		},
-		actions: {},
 	};
 }
diff --git a/core/src/components/rating/rating.ts b/core/src/components/rating/rating.ts
@@ -184,7 +184,7 @@ export interface RatingApi {
 	leave(): void;
 }
 
-export type RatingWidget = Widget<RatingProps, RatingState, RatingApi, object, RatingDirectives>;
+export type RatingWidget = Widget<RatingProps, RatingState, RatingApi, RatingDirectives>;
 
 const defaultConfig: RatingProps = {
 	rating: 0,
@@ -285,7 +285,6 @@ export function createRating(config?: PropsConfig<RatingProps>): RatingWidget {
 			...stateProps,
 		}),
 		patch,
-		actions: {},
 		directives: {
 			containerDirective: createAttributesDirective(() => ({
 				events: {

diff --git a/core/src/components/select/select.ts b/core/src/components/select/select.ts
@@ -322,7 +322,7 @@ export interface SelectDirectives<Item> {
 	badgeCloseButtonDirective: Directive<ItemContext<Item>>;
 }
 
-export type SelectWidget<Item> = Widget<SelectProps<Item>, SelectState<Item>, SelectApi<Item>, object, SelectDirectives<Item>>;
+export type SelectWidget<Item> = Widget<SelectProps<Item>, SelectState<Item>, SelectApi<Item>, SelectDirectives<Item>>;
 
 const defaultConfig: SelectProps<any> = {
 	id: undefined,
@@ -732,7 +732,6 @@ export function createSelect<Item>(config?: PropsConfig<SelectProps<Item>>): Sel
 			inputDirective,
 			badgeCloseButtonDirective,
 		},
-		actions: {},
 	};
 
 	return widget;

diff --git a/core/src/components/slider/slider.ts b/core/src/components/slider/slider.ts
@@ -276,7 +276,7 @@ export interface SliderDirectives {
 	handleLabelDisplayDirective: Directive<{index: number}>;
 }
 
-export type SliderWidget = Widget<SliderProps, SliderState, object, object, SliderDirectives>;
+export type SliderWidget = Widget<SliderProps, SliderState, object, SliderDirectives>;
 
 const defaultSliderConfig: SliderProps = {
 	min: 0,
@@ -865,7 +865,6 @@ export function createSlider(config?: PropsConfig<SliderProps>): SliderWidget {
 				},
 			})),
 		},
-		actions: {},
 	};
 
 	return widget;

diff --git a/core/src/components/toast/toast.ts b/core/src/components/toast/toast.ts
@@ -44,7 +44,7 @@ export interface ToastApi extends CommonAlertApi {}
 
 export interface ToastDirectives extends CommonAlertDirectives, ExtraDirectives {}
 
-export type ToastWidget = Widget<ToastProps, ToastState, ToastApi, object, ToastDirectives>;
+export type ToastWidget = Widget<ToastProps, ToastState, ToastApi, ToastDirectives>;
 
 const toastDefaultConfig: ToastExtraProps = {
 	autoHide: true,

diff --git a/core/src/services/extendWidget.spec.ts b/core/src/services/extendWidget.spec.ts
@@ -39,7 +39,6 @@ describe(`extendWidgetProps`, () => {
 				myOtherNewProp: 'value',
 			},
 		});
-		expect(Object.keys(customWidget.actions)).toEqual(Object.keys(originalWidget.actions));
 		expect(Object.keys(customWidget.api)).toEqual(Object.keys(originalWidget.api));
 		expect(Object.keys(customWidget.directives)).toEqual(Object.keys(originalWidget.directives));
 		expect(Object.keys(customWidget.stores)).toEqual([...Object.keys(originalWidget.stores), 'myNewProp$', 'myOtherNewProp$']);

diff --git a/core/src/services/extendWidget.ts b/core/src/services/extendWidget.ts
@@ -19,7 +19,6 @@ export type ExtendWidgetProps<W extends Widget, ExtraProps extends object, Extra
 	ExtendWidgetAdaptSlotWidgetProps<WidgetProps<W>, ExtraProps, ExtraDirectives>,
 	ExtendWidgetAdaptSlotWidgetProps<WidgetState<W>, ExtraProps, ExtraDirectives>,
 	W['api'],
-	W['actions'],
 	ExtendWidgetInterfaces<W['directives'], ExtraDirectives>
 >;
 

diff --git a/core/src/services/floatingUI.ts b/core/src/services/floatingUI.ts
@@ -76,7 +76,7 @@ const defaultConfig: FloatingUIProps = {
 	arrowOptions: {},
 };
 
-export type FloatingUI = Omit<Widget<FloatingUIProps, FloatingUIState, object, object, FloatingUIDirectives>, 'api' | 'actions'>;
+export type FloatingUI = Omit<Widget<FloatingUIProps, FloatingUIState, object, FloatingUIDirectives>, 'api'>;
 
 /**
  * Create a floating UI service.

diff --git a/core/src/services/transitions/baseTransitions.ts b/core/src/services/transitions/baseTransitions.ts
@@ -161,7 +161,7 @@ export interface TransitionDirectives {
 	directive: Directive<void | Partial<TransitionProps>>;
 }
 
-export type TransitionWidget = Widget<TransitionProps, TransitionState, TransitionApi, object, TransitionDirectives>;
+export type TransitionWidget = Widget<TransitionProps, TransitionState, TransitionApi, TransitionDirectives>;
 
 const neverEndingPromise = new Promise<never>(noop);
 
@@ -361,7 +361,6 @@ export const createTransition = (config?: PropsConfig<TransitionProps>): Transit
 		directives: {
 			directive,
 		},
-		actions: {},
 		api: {
 			show: toggle.bind(null, true),
 			hide: toggle.bind(null, false),