@agnos-ui/core 0.0.1-alpha.4 → 0.0.1-alpha.5

package/{accordion.d.ts → components/accordion/accordion.d.ts}

@@ -1,7 +1,6 @@
-import type { PropsConfig } from './services';
-import type { TransitionFn } from './transitions';
-import type { Directive, SlotContent, Widget, WidgetSlotContext } from './types';
-import type { WidgetsCommonPropsAndState } from './commonProps';
+import type { TransitionFn } from '../../services/transitions/baseTransitions';
+import type { Directive, PropsConfig, SlotContent, Widget, WidgetSlotContext } from '../../types';
+import type { WidgetsCommonPropsAndState } from '../commonProps';
 export interface AccordionProps extends WidgetsCommonPropsAndState {
     /**
      * If `true`, only one item at the time can stay open.

package/{accordion.js → components/accordion/accordion.js}

@@ -1,8 +1,10 @@
-import { bindDirectiveNoArg, bindableDerived, directiveSubscribe, registrationArray, stateStores, typeBoolean, typeFunction, typeString, writablesForProps, normalizeConfigStores, mergeConfigStores, } from './services';
-import { createTransition } from './transitions';
-import { collapseVerticalTransition } from './transitions/bootstrap';
-import { computed, readable, writable } from '@amadeus-it-group/tansu';
-import { noop } from './utils';
+import { stateStores, writablesForProps, normalizeConfigStores, mergeConfigStores } from '../../utils/stores';
+import { createTransition } from '../../services/transitions/baseTransitions';
+import { collapseVerticalTransition } from '../../services/transitions/bootstrap/collapse';
+import { computed, writable } from '@amadeus-it-group/tansu';
+import { noop } from '../../utils/internal/func';
+import { typeBoolean, typeFunction, typeString } from '../../utils/writables';
+import { bindDirectiveNoArg, directiveSubscribe, registrationArray } from '../../utils/directive';
 let itemId = 0;
 function getItemId() {
     return `accordion-item-${itemId++}`;
@@ -121,10 +123,9 @@ const configItemValidator = {
 function createAccordionItem(accordionOnShown, accordionOnHidden, config) {
     const [{ itemAnimation$, itemTransition$, itemDestroyOnHide$, onItemShown$, onItemHidden$, onItemVisibleChange$, itemVisible$, itemId$: _dirtyItemId$, itemDisabled$, ...stateProps }, patch,] = writablesForProps(defaultItemConfig, config, configItemValidator);
     const initDone$ = writable(false);
-    const itemId$ = bindableDerived(readable(noop), [_dirtyItemId$], ([dirtyItemId]) => (dirtyItemId ? dirtyItemId : getItemId()));
-    const shouldBeInDOM$ = computed(() => {
-        return itemDestroyOnHide$() === false || !itemTransition.state$().hidden;
-    });
+    const _autoItemId$ = computed(() => getItemId());
+    const itemId$ = computed(() => _dirtyItemId$() || _autoItemId$());
+    const shouldBeInDOM$ = computed(() => itemDestroyOnHide$() === false || !itemTransition.state$().hidden);
     const itemTransition = createTransition({
         props: {
             transition: itemTransition$,

package/components/alert/alert.d.ts

@@ -0,0 +1,32 @@
+import type { CommonAlertApi, CommonAlertDirectives, CommonAlertProps, CommonAlertState } from './common';
+import type { ExtendWidgetAdaptSlotWidgetProps } from '../../services/extendWidget';
+import type { Widget, WidgetFactory, WidgetSlotContext } from '../../types';
+export * from './common';
+export type AlertContext = WidgetSlotContext<AlertWidget>;
+export interface AlertExtraProps {
+    /**
+     * Type of the alert.
+     * There are the following types: 'success', 'info', 'warning', 'danger', 'primary', 'secondary', 'light' and 'dark'.
+     */
+    type: string;
+}
+export interface AlertState extends ExtendWidgetAdaptSlotWidgetProps<CommonAlertState, AlertExtraProps> {
+}
+export interface AlertProps extends ExtendWidgetAdaptSlotWidgetProps<CommonAlertProps, AlertExtraProps> {
+}
+export interface AlertApi extends CommonAlertApi {
+}
+export interface AlertDirectives extends CommonAlertDirectives {
+}
+export type AlertWidget = Widget<AlertProps, AlertState, AlertApi, object, AlertDirectives>;
+/**
+ * Retrieve a shallow copy of the default alert config
+ * @returns the default alert config
+ */
+export declare function getAlertDefaultConfig(): AlertProps;
+/**
+ * Create an AlertWidget with given config props
+ * @param config - an optional alert config
+ * @returns an AlertWidget
+ */
+export declare const createAlert: WidgetFactory<AlertWidget>;

package/components/alert/alert.js

@@ -0,0 +1,23 @@
+import { createCommonAlert, getCommonAlertDefaultConfig } from './common';
+import { extendWidgetProps } from '../../services/extendWidget';
+import { typeString } from '../../utils/writables';
+export * from './common';
+const alertDefaultConfig = {
+    type: 'primary',
+};
+const alertConfigValidator = {
+    type: typeString,
+};
+/**
+ * Retrieve a shallow copy of the default alert config
+ * @returns the default alert config
+ */
+export function getAlertDefaultConfig() {
+    return { ...getCommonAlertDefaultConfig(), ...alertDefaultConfig };
+}
+/**
+ * Create an AlertWidget with given config props
+ * @param config - an optional alert config
+ * @returns an AlertWidget
+ */
+export const createAlert = extendWidgetProps(createCommonAlert, alertDefaultConfig, alertConfigValidator);

package/{alert.d.ts → components/alert/common.d.ts}

@@ -1,27 +1,21 @@
-import type { WidgetsCommonPropsAndState } from './commonProps';
-import type { PropsConfig } from './services';
-import type { TransitionFn } from './transitions';
-import type { Directive, SlotContent, Widget, WidgetSlotContext } from './types';
-export type AlertContext = WidgetSlotContext<AlertWidget>;
-export interface AlertCommonPropsAndState extends WidgetsCommonPropsAndState {
+import type { TransitionFn } from '../../services/transitions/baseTransitions';
+import type { WidgetsCommonPropsAndState } from '../commonProps';
+import type { ConfigValidator, Directive, PropsConfig, SlotContent, Widget, WidgetSlotContext } from '../../types';
+export type CommonAlertContext = WidgetSlotContext<CommonAlertWidget>;
+export interface CommonAlertCommonPropsAndState extends WidgetsCommonPropsAndState {
     /**
      * If `true`, alert can be dismissed by the user.
      * The close button (×) will be displayed and you can be notified of the event with the (close) output.
      */
     dismissible: boolean;
-    /**
-     * Type of the alert.
-     * There are the following types: 'success', 'info', 'warning', 'danger', 'primary', 'secondary', 'light' and 'dark'.
-     */
-    type: string;
     /**
      * Template for the alert content
      */
-    slotDefault: SlotContent<AlertContext>;
+    slotDefault: SlotContent<CommonAlertContext>;
     /**
      * Global template for the alert component
      */
-    slotStructure: SlotContent<AlertContext>;
+    slotStructure: SlotContent<CommonAlertContext>;
     /**
      * If `true` the alert is visible to the user
      */
@@ -31,13 +25,13 @@ export interface AlertCommonPropsAndState extends WidgetsCommonPropsAndState {
      */
     ariaCloseButtonLabel: string;
 }
-export interface AlertState extends AlertCommonPropsAndState {
+export interface CommonAlertState extends CommonAlertCommonPropsAndState {
     /**
      * Is `true` when the alert is hidden. Compared to `visible`, this is updated after the transition is executed.
      */
     hidden: boolean;
 }
-export interface AlertProps extends AlertCommonPropsAndState {
+export interface CommonAlertProps extends CommonAlertCommonPropsAndState {
     /**
      * Callback called when the alert visibility changed.
      */
@@ -53,7 +47,7 @@ export interface AlertProps extends AlertCommonPropsAndState {
     /**
      * The transition function will be executed when the alert is displayed or hidden.
      *
-     * Depending on the value of {@link AlertProps.animationOnInit}, the animation can be optionally skipped during the showing process.
+     * Depending on the value of {@link CommonAlertProps.animationOnInit}, the animation can be optionally skipped during the showing process.
      */
     transition: TransitionFn;
     /**
@@ -71,7 +65,7 @@ export interface AlertProps extends AlertCommonPropsAndState {
      */
     animation: boolean;
 }
-export interface AlertApi {
+export interface CommonAlertApi {
     /**
      * Triggers alert closing programmatically (same as clicking on the close button (×)).
      */
@@ -81,21 +75,23 @@ export interface AlertApi {
      */
     open(): void;
 }
-export interface AlertDirectives {
+export interface CommonAlertDirectives {
     /**
      * the transition directive, piloting what is the visual effect of going from hidden to visible
      */
     transitionDirective: Directive;
 }
-export type AlertWidget = Widget<AlertProps, AlertState, AlertApi, object, AlertDirectives>;
+export type CommonAlertWidget = Widget<CommonAlertProps, CommonAlertState, CommonAlertApi, object, CommonAlertDirectives>;
+export declare const defaultCommonAlertConfig: CommonAlertProps;
 /**
  * Retrieve a shallow copy of the default alert config
  * @returns the default alert config
  */
-export declare function getAlertDefaultConfig(): AlertProps;
+export declare function getCommonAlertDefaultConfig(): CommonAlertProps;
+export declare const commonAlertConfigValidator: ConfigValidator<CommonAlertProps>;
 /**
  * Create an AlertWidget with given config props
  * @param config - an optional alert config
  * @returns an AlertWidget
  */
-export declare function createAlert(config?: PropsConfig<AlertProps>): AlertWidget;
+export declare function createCommonAlert(config?: PropsConfig<CommonAlertProps>): CommonAlertWidget;

package/{alert.js → components/alert/common.js}

@@ -1,11 +1,12 @@
-import { bindDirectiveNoArg, stateStores, typeBoolean, typeString, writablesForProps } from './services';
-import { createTransition } from './transitions';
-import { fadeTransition } from './transitions/bootstrap';
-import { noop } from './utils';
-const defaultConfig = {
+import { createTransition } from '../../services/transitions/baseTransitions';
+import { noop } from '../../utils/internal/func';
+import { fadeTransition } from '../../services/transitions/bootstrap/fade';
+import { stateStores, writablesForProps } from '../../utils/stores';
+import { bindDirectiveNoArg } from '../../utils/directive';
+import { typeBoolean } from '../../utils/writables';
+export const defaultCommonAlertConfig = {
     visible: true,
     dismissible: true,
-    type: 'primary',
     ariaCloseButtonLabel: 'Close',
     onVisibleChange: noop,
     onShown: noop,
@@ -21,20 +22,19 @@ const defaultConfig = {
  * Retrieve a shallow copy of the default alert config
  * @returns the default alert config
  */
-export function getAlertDefaultConfig() {
-    return { ...defaultConfig };
+export function getCommonAlertDefaultConfig() {
+    return { ...defaultCommonAlertConfig };
 }
-const configValidator = {
+export const commonAlertConfigValidator = {
     dismissible: typeBoolean,
-    type: typeString,
 };
 /**
  * Create an AlertWidget with given config props
  * @param config - an optional alert config
  * @returns an AlertWidget
  */
-export function createAlert(config) {
-    const [{ transition$, animationOnInit$, animation$, visible$: requestedVisible$, onVisibleChange$, onHidden$, onShown$, ...stateProps }, patch,] = writablesForProps(defaultConfig, config, configValidator);
+export function createCommonAlert(config) {
+    const [{ transition$, animationOnInit$, animation$, visible$: requestedVisible$, onVisibleChange$, onHidden$, onShown$, ...stateProps }, patch,] = writablesForProps(defaultCommonAlertConfig, config, commonAlertConfigValidator);
     const transition = createTransition({
         props: {
             transition: transition$,

package/{modal → components/modal}/modal.d.ts

@@ -1,7 +1,6 @@
-import type { PropsConfig } from '../services';
-import type { TransitionFn } from '../transitions';
-import type { Widget, Directive, SlotContent, WidgetSlotContext } from '../types';
 import type { WidgetsCommonPropsAndState } from '../commonProps';
+import type { TransitionFn } from '../../services/transitions/baseTransitions';
+import type { Directive, PropsConfig, SlotContent, Widget, WidgetSlotContext } from '../../types';
 /**
  * Value present in the {@link ModalBeforeCloseEvent.result|result} property of the {@link ModalProps.onBeforeClose|onBeforeClose} event
  * and returned by the {@link ModalApi.open|open} method, when the modal is closed by a click inside the viewport but outside the modal.
@@ -15,11 +14,11 @@ export declare const modalCloseButtonClick: unique symbol;
 /**
  * Context of the modal slots.
  */
-export type ModalContext = WidgetSlotContext<ModalWidget>;
+export type ModalContext<Data> = WidgetSlotContext<ModalWidget<Data>>;
 /**
  * Properties of the modal widget that are also in the state of the modal.
  */
-export interface ModalCommonPropsAndState extends WidgetsCommonPropsAndState {
+export interface ModalCommonPropsAndState<Data> extends WidgetsCommonPropsAndState {
     /**
      * Value of the aria-label attribute to put on the close button.
      */
@@ -41,28 +40,32 @@ export interface ModalCommonPropsAndState extends WidgetsCommonPropsAndState {
     /**
      * Body of the modal.
      */
-    slotDefault: SlotContent<ModalContext>;
+    slotDefault: SlotContent<ModalContext<Data>>;
     /**
      * Footer of the modal.
      */
-    slotFooter: SlotContent<ModalContext>;
+    slotFooter: SlotContent<ModalContext<Data>>;
     /**
      * Header of the modal. The default header includes {@link ModalCommonPropsAndState.slotTitle|slotTitle}.
      */
-    slotHeader: SlotContent<ModalContext>;
+    slotHeader: SlotContent<ModalContext<Data>>;
     /**
      * Structure of the modal.
      * The default structure uses {@link ModalCommonPropsAndState.slotHeader|slotHeader}, {@link ModalCommonPropsAndState.slotDefault|slotDefault} and {@link ModalCommonPropsAndState.slotFooter|slotFooter}.
      */
-    slotStructure: SlotContent<ModalContext>;
+    slotStructure: SlotContent<ModalContext<Data>>;
     /**
      * Title of the modal.
      */
-    slotTitle: SlotContent<ModalContext>;
+    slotTitle: SlotContent<ModalContext<Data>>;
     /**
      * Whether the modal should be visible when the transition is completed.
      */
     visible: boolean;
+    /**
+     * Data to use in content slots
+     */
+    contentData: Data;
 }
 /**
  * Type of the parameter of {@link ModalProps.onBeforeClose|onBeforeClose}.
@@ -83,7 +86,7 @@ export interface ModalBeforeCloseEvent {
 /**
  * Properties of the modal widget.
  */
-export interface ModalProps extends ModalCommonPropsAndState {
+export interface ModalProps<Data> extends ModalCommonPropsAndState<Data> {
     /**
      * Whether the modal and its backdrop (if present) should be animated when shown or hidden.
      */
@@ -129,7 +132,7 @@ export interface ModalProps extends ModalCommonPropsAndState {
 /**
  * State of the modal widget.
  */
-export interface ModalState extends ModalCommonPropsAndState {
+export interface ModalState<Data> extends ModalCommonPropsAndState<Data> {
     /**
      * Whether the backdrop is fully hidden. This can be true either because {@link ModalProps.backdrop|backdrop} is false or
      * because {@link ModalCommonPropsAndState.visible|visible} is false and there is no current transition.
@@ -151,7 +154,7 @@ export interface ModalState extends ModalCommonPropsAndState {
 /**
  * API of the modal widget.
  */
-export interface ModalApi {
+export interface ModalApi<Data> {
     /**
      * Closes the modal with the given result.
      *
@@ -168,7 +171,7 @@ export interface ModalApi {
     /**
      * Method to change some modal properties.
      */
-    patch: ModalWidget['patch'];
+    patch: ModalWidget<Data>['patch'];
 }
 /**
  * Actions of the modal widget.
@@ -212,7 +215,7 @@ export interface ModalDirectives {
 /**
  * Modal widget.
  */
-export type ModalWidget = Widget<ModalProps, ModalState, ModalApi, ModalActions, ModalDirectives>;
+export type ModalWidget<Data> = Widget<ModalProps<Data>, ModalState<Data>, ModalApi<Data>, ModalActions, ModalDirectives>;
 /**
  * Returns a copy of the default modal config.
  * @returns a copy of the default modal config
@@ -280,28 +283,32 @@ export declare function getModalDefaultConfig(): {
     /**
      * Body of the modal.
      */
-    slotDefault: SlotContent<ModalContext>;
+    slotDefault: SlotContent<ModalContext<any>>;
     /**
      * Footer of the modal.
      */
-    slotFooter: SlotContent<ModalContext>;
+    slotFooter: SlotContent<ModalContext<any>>;
     /**
      * Header of the modal. The default header includes {@link ModalCommonPropsAndState.slotTitle|slotTitle}.
      */
-    slotHeader: SlotContent<ModalContext>;
+    slotHeader: SlotContent<ModalContext<any>>;
     /**
      * Structure of the modal.
      * The default structure uses {@link ModalCommonPropsAndState.slotHeader|slotHeader}, {@link ModalCommonPropsAndState.slotDefault|slotDefault} and {@link ModalCommonPropsAndState.slotFooter|slotFooter}.
      */
-    slotStructure: SlotContent<ModalContext>;
+    slotStructure: SlotContent<ModalContext<any>>;
     /**
      * Title of the modal.
      */
-    slotTitle: SlotContent<ModalContext>;
+    slotTitle: SlotContent<ModalContext<any>>;
     /**
      * Whether the modal should be visible when the transition is completed.
      */
     visible: boolean;
+    /**
+     * Data to use in content slots
+     */
+    contentData: any;
     className: string;
 };
 /**
@@ -309,4 +316,4 @@ export declare function getModalDefaultConfig(): {
  * @param config$ - config of the modal, either as a store or as an object containing values or stores.
  * @returns a new modal widget instance
  */
-export declare const createModal: (config$?: PropsConfig<ModalProps>) => ModalWidget;
+export declare function createModal<Data>(config$?: PropsConfig<ModalProps<Data>>): ModalWidget<Data>;

package/{modal → components/modal}/modal.js

@@ -1,10 +1,14 @@
 import { computed, readable } from '@amadeus-it-group/tansu';
-import { sliblingsInert, bindDirective, bindDirectiveNoArg, directiveSubscribe, mergeDirectives, portal, registrationArray, stateStores, writablesForProps, } from '../services';
-import { createTransition } from '../transitions';
-import { fadeTransition } from '../transitions/bootstrap/fade';
-import { promiseFromStore } from '../transitions/utils';
-import { noop } from '../utils';
-import { removeScrollbars, revertScrollbars } from './scrollbars';
+import { typeBoolean, typeFunction, typeHTMLElementOrNull, typeString } from '../../utils/writables';
+import { stateStores, writablesForProps } from '../../utils/stores';
+import { createTransition } from '../../services/transitions/baseTransitions';
+import { fadeTransition } from '../../services/transitions/bootstrap/fade';
+import { promiseFromStore } from '../../utils/internal/promise';
+import { noop } from '../../utils/internal/func';
+import { removeScrollbars, revertScrollbars } from '../../utils/internal/scrollbars';
+import { bindDirective, bindDirectiveNoArg, directiveSubscribe, mergeDirectives, registrationArray } from '../../utils/directive';
+import { portal } from '../../services/portal';
+import { sliblingsInert } from '../../services/siblingsInert';
 /**
  * Value present in the {@link ModalBeforeCloseEvent.result|result} property of the {@link ModalProps.onBeforeClose|onBeforeClose} event
  * and returned by the {@link ModalApi.open|open} method, when the modal is closed by a click inside the viewport but outside the modal.
@@ -36,6 +40,24 @@ const defaultConfig = {
     slotStructure: undefined,
     slotTitle: undefined,
     visible: false,
+    contentData: undefined,
+};
+const configValidator = {
+    animation: typeBoolean,
+    ariaCloseButtonLabel: typeString,
+    backdrop: typeBoolean,
+    backdropClass: typeString,
+    backdropTransition: typeFunction,
+    closeButton: typeBoolean,
+    closeOnOutsideClick: typeBoolean,
+    container: typeHTMLElementOrNull,
+    className: typeString,
+    modalTransition: typeFunction,
+    onBeforeClose: typeFunction,
+    onVisibleChange: typeFunction,
+    onHidden: typeFunction,
+    onShown: typeFunction,
+    visible: typeBoolean,
 };
 /**
  * Returns a copy of the default modal config.
@@ -62,8 +84,8 @@ const modalsAction$ = computed(() => {
  * @param config$ - config of the modal, either as a store or as an object containing values or stores.
  * @returns a new modal widget instance
  */
-export const createModal = (config$) => {
-    const [{ animation$, backdrop$, backdropTransition$, closeOnOutsideClick$, container$, modalTransition$, onBeforeClose$, onVisibleChange$, onHidden$, onShown$, visible$: requestedVisible$, ...stateProps }, patch,] = writablesForProps(defaultConfig, config$);
+export function createModal(config$) {
+    const [{ animation$, backdrop$, backdropTransition$, closeOnOutsideClick$, container$, modalTransition$, onBeforeClose$, onVisibleChange$, onHidden$, onShown$, visible$: requestedVisible$, ...stateProps }, patch,] = writablesForProps(defaultConfig, config$, configValidator);
     const modalTransition = createTransition({
         props: {
             transition: modalTransition$,
@@ -108,10 +130,14 @@ export const createModal = (config$) => {
         patch({ visible: false });
     };
     const modalPortalDirective = bindDirective(portal, computed(() => ({ container: container$() })));
-    const backdropPortalDirective = bindDirective(portal, computed(() => ({
-        container: container$(),
-        insertBefore: container$() && modalTransition.stores.element$()?.parentElement === container$() ? modalTransition.stores.element$() : undefined,
-    })));
+    const backdropPortalDirective = bindDirective(portal, computed(() => {
+        const container = container$();
+        const element = container ? modalTransition.stores.element$() : undefined;
+        return {
+            container,
+            insertBefore: element?.parentElement === container ? element : undefined,
+        };
+    }));
     const registerModalAction$ = readable(undefined, () => modals$.register(res));
     const action$ = computed(() => {
         if (modalTransition.stores.elementPresent$() && !hidden$()) {
@@ -157,4 +183,4 @@ export const createModal = (config$) => {
         },
     };
     return res;
-};
+}

package/{pagination.d.ts → components/pagination/pagination.d.ts}

@@ -1,6 +1,6 @@
-import type { PropsConfig } from './services';
-import type { Widget, SlotContent, WidgetSlotContext } from './types';
-import type { WidgetsCommonPropsAndState } from './commonProps';
+import type { PropsConfig, Widget, SlotContent, WidgetSlotContext } from '../../types';
+import type { WidgetsCommonPropsAndState } from '../commonProps';
+export * from './bootstrap';
 /**
  * A type for the slot context of the pagination widget
  */

package/{pagination.js → components/pagination/pagination.js}

@@ -1,8 +1,10 @@
 import { computed } from '@amadeus-it-group/tansu';
-import { bindableDerived, INVALID_VALUE, stateStores, writablesForProps } from './services';
-import { clamp, isNumber } from './services/checks';
-import { typeBoolean, typeFunction, typeNumber, typeString } from './services/writables';
-import { noop } from './utils';
+import { INVALID_VALUE } from '../../types';
+import { bindableDerived, stateStores, writablesForProps } from '../../utils/stores';
+import { clamp, isNumber } from '../../utils/internal/checks';
+import { typeBoolean, typeFunction, typeNumber, typeString } from '../../utils/writables';
+import { noop } from '../../utils/internal/func';
+export * from './bootstrap';
 const defaultConfig = {
     page: 1,
     collectionSize: 0,

package/{progressbar.d.ts → components/progressbar/progressbar.d.ts}

@@ -1,6 +1,5 @@
-import type { PropsConfig } from './services';
-import type { SlotContent, Widget, WidgetSlotContext } from './types';
-import type { WidgetsCommonPropsAndState } from './commonProps';
+import type { PropsConfig, SlotContent, Widget, WidgetSlotContext } from '../../types';
+import type { WidgetsCommonPropsAndState } from '../commonProps';
 export type ProgressbarContext = WidgetSlotContext<ProgressbarWidget>;
 export interface ProgressbarCommonPropsAndState extends WidgetsCommonPropsAndState {
     /**

package/{progressbar.js → components/progressbar/progressbar.js}

@@ -1,7 +1,7 @@
-import { clamp } from './services/checks';
-import { bindableDerived, stateStores, typeBoolean, typeFunction, typeNumber, typeString, writablesForProps } from './services';
-import { computed, readable } from '@amadeus-it-group/tansu';
-import { noop } from './utils';
+import { clamp } from '../../utils/internal/checks';
+import { typeBoolean, typeFunction, typeNumber, typeString } from '../../utils/writables';
+import { stateStores, writablesForProps } from '../../utils/stores';
+import { computed } from '@amadeus-it-group/tansu';
 const defaultConfig = {
     min: 0,
     max: 100,
@@ -44,8 +44,8 @@ export function createProgressbar(config) {
     max$: _dirtyMaximum$, value$: _dirtyValue$, 
     // clean inputs
     min$, ariaValueTextFn$, ...stateProps }, patch,] = writablesForProps(defaultConfig, config, configValidator);
-    const max$ = bindableDerived(readable(noop), [_dirtyMaximum$, min$], ([dirtyMaximum, minimum]) => Math.max(minimum, dirtyMaximum));
-    const value$ = bindableDerived(readable(noop), [_dirtyValue$, min$, max$], ([dirtyValue, min, max]) => clamp(dirtyValue, max, min));
+    const max$ = computed(() => Math.max(min$(), _dirtyMaximum$()));
+    const value$ = computed(() => clamp(_dirtyValue$(), max$(), min$()));
     const percentage$ = computed(() => {
         const max = max$();
         const min = min$();

package/{rating.d.ts → components/rating/rating.d.ts}

@@ -1,6 +1,5 @@
-import type { PropsConfig } from './services';
-import type { SlotContent, Widget } from './types';
-import type { WidgetsCommonPropsAndState } from './commonProps';
+import type { PropsConfig, SlotContent, Widget } from '../../types';
+import type { WidgetsCommonPropsAndState } from '../commonProps';
 export interface StarContext {
     /**
      * indicates how much the current star is filled, from 0 to 100

package/{rating.js → components/rating/rating.js}

@@ -1,12 +1,9 @@
 import { computed, writable } from '@amadeus-it-group/tansu';
-import { INVALID_VALUE, bindableDerived, stateStores, writablesForProps } from './services';
-import { isNumber } from './services/checks';
-import { typeBoolean, typeFunction, typeNumber, typeString } from './services/writables';
-// TODO use getValueInRange
-function adjustRating(rating, maxRating) {
-    return Math.max(Math.min(rating, maxRating), 0);
-}
-const noop = () => { };
+import { INVALID_VALUE } from '../../types';
+import { bindableDerived, stateStores, writablesForProps } from '../../utils/stores';
+import { clamp, isNumber } from '../../utils/internal/checks';
+import { typeBoolean, typeFunction, typeNumber, typeString } from '../../utils/writables';
+import { noop } from '../../utils/internal/func';
 const defaultConfig = {
     rating: 0,
     tabindex: 0,
@@ -60,7 +57,7 @@ export function createRating(config) {
     const { maxRating$, disabled$, readonly$, resettable$ } = stateProps;
     // clean inputs adjustment to valid range
     const tabindex$ = computed(() => (disabled$() ? -1 : _dirtyTabindex$()));
-    const rating$ = bindableDerived(onRatingChange$, [_dirtyRating$, maxRating$], ([dirtyRating, maxRating]) => adjustRating(dirtyRating, maxRating));
+    const rating$ = bindableDerived(onRatingChange$, [_dirtyRating$, maxRating$], ([dirtyRating, maxRating]) => clamp(dirtyRating, maxRating));
     // internal inputs
     const _hoveredRating$ = writable(0);
     // computed