@pi-spi/app 1.3.0 → 1.4.0

package/lib/module/modules/search/presentation/pages/search_page_voice_button.js

@@ -0,0 +1,335 @@
+"use strict";
+
+import { MaterialIcons } from '@expo/vector-icons';
+import { useEffect, useRef, useState } from 'react';
+import { AccessibilityInfo, Animated, Easing, Platform, Pressable, StyleSheet, Vibration } from 'react-native';
+import { useTheme } from "../../../../core/theme.js";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/** Zone tactile, plus grande que le disque pour laisser place aux ondes. */
+const TAILLE = 40;
+
+/** Diamètre du disque une fois actif. */
+const DISQUE = 30;
+
+/** Taille du disque au repos, par rapport à sa taille active. */
+const ECHELLE_REPOS = 0.85;
+
+/** Durée d'un cycle d'onde pendant l'écoute. */
+const CYCLE_ONDES = 1600;
+
+/** Nombre d'ondes, décalées d'un tiers de cycle. */
+const NOMBRE_ONDES = 3;
+
+/**
+ * Bouton micro de la recherche.
+ *
+ * Trois états visuels :
+ * - repos : micro coloré sur un disque teinté, pour se distinguer des
+ *   autres icônes du champ. À l'ouverture, deux pulsations douces
+ *   signalent qu'il est utilisable ;
+ * - actif ([ecoute]) : disque plein qui grossit avec un léger rebond,
+ *   et trois ondes qui en partent en continu ;
+ * - appui : le bouton s'enfonce légèrement, avec une vibration (Android).
+ *
+ * Les ondes et l'invitation sont coupées si le téléphone demande de
+ * réduire les animations (accessibilité) ; seul le changement d'état
+ * du disque reste visible.
+ */
+export function SearchPageVoiceButton({
+  ecoute,
+  niveau,
+  onPress,
+  tooltip
+}) {
+  const theme = useTheme();
+  const couleur = theme.colorScheme.primary;
+  const surCouleur = theme.colorScheme.onPrimary;
+  const animationsReduites = useAnimationsReduites();
+
+  /** Passage repos → actif (0 → 1). */
+  const entree = useRef(new Animated.Value(ecoute ? 1 : 0)).current;
+  /** Enfoncement au toucher. */
+  const appui = useRef(new Animated.Value(0)).current;
+  /** Une pulsation d'invitation au repos, de 0 à 1. */
+  const invitation = useRef(new Animated.Value(0)).current;
+  /** [niveau] adouci, pour que le disque ne tremble pas à chaque mesure du micro. */
+  const niveauLisse = useRef(new Animated.Value(0)).current;
+  /** Avancement de chaque onde d'écoute, de 0 à 1. */
+  const ondes = useRef(Array.from({
+    length: NOMBRE_ONDES
+  }, () => new Animated.Value(0))).current;
+
+  // Allume ou éteint le bouton : rebond à l'arrivée, retour plus rapide.
+  useEffect(() => {
+    if (ecoute) invitation.setValue(0);
+    const animation = ecoute ? Animated.spring(entree, {
+      toValue: 1,
+      friction: 5,
+      tension: 120,
+      useNativeDriver: true
+    }) : Animated.timing(entree, {
+      toValue: 0,
+      duration: 240,
+      easing: Easing.in(Easing.cubic),
+      useNativeDriver: true
+    });
+    animation.start();
+    return () => animation.stop();
+  }, [ecoute, entree, invitation]);
+
+  // Ondes en boucle pendant l'écoute, décalées d'un tiers de cycle.
+  useEffect(() => {
+    if (!ecoute || animationsReduites) return;
+    const boucles = ondes.map((onde, i) => {
+      onde.setValue(0);
+      return Animated.sequence([Animated.delay(CYCLE_ONDES / NOMBRE_ONDES * i), Animated.loop(Animated.timing(onde, {
+        toValue: 1,
+        duration: CYCLE_ONDES,
+        easing: Easing.linear,
+        useNativeDriver: true
+      }))]);
+    });
+    boucles.forEach(boucle => boucle.start());
+    return () => boucles.forEach(boucle => boucle.stop());
+  }, [ecoute, animationsReduites, ondes]);
+
+  // Le volume suit la voix en douceur, et retombe à 0 hors écoute.
+  useEffect(() => {
+    const suivre = () => Animated.timing(niveauLisse, {
+      toValue: ecoute ? Math.min(Math.max(niveau.value, 0), 1) : 0,
+      duration: 120,
+      useNativeDriver: true
+    }).start();
+    suivre();
+    return niveau.addListener(suivre);
+  }, [ecoute, niveau, niveauLisse]);
+
+  // Invitation : deux pulsations, une seule fois par ouverture de la page,
+  // après l'entrée de la page pour que l'œil la voie.
+  const invitationLancee = useRef(false);
+  useEffect(() => {
+    if (invitationLancee.current || animationsReduites !== false) return;
+    invitationLancee.current = true;
+    if (ecoute) return;
+    const pulsation = () => Animated.timing(invitation, {
+      toValue: 1,
+      duration: 1100,
+      useNativeDriver: true
+    });
+    invitation.setValue(0);
+    const animation = Animated.sequence([Animated.delay(500), pulsation(), Animated.timing(invitation, {
+      toValue: 0,
+      duration: 0,
+      useNativeDriver: true
+    }), pulsation()]);
+    animation.start();
+    return () => animation.stop();
+  }, [animationsReduites, ecoute, invitation]);
+  const toucher = () => {
+    // Sur iOS, `Vibration` ne sait faire qu'une longue vibration : pas de retour haptique.
+    if (Platform.OS === 'android') Vibration.vibrate(10);
+    onPress();
+  };
+  const presence = entree.interpolate({
+    inputRange: [0, 1],
+    outputRange: [0, 1],
+    extrapolate: 'clamp'
+  });
+  // 0 → 1 → 0 sur une pulsation d'invitation.
+  const souffle = invitation.interpolate({
+    inputRange: [0, 0.5, 1],
+    outputRange: [0, 1, 0]
+  });
+  const echelle = Animated.multiply(Animated.multiply(entree.interpolate({
+    inputRange: [0, 1, 1.2],
+    outputRange: [ECHELLE_REPOS, 1, 1.03],
+    extrapolate: 'clamp'
+  }), niveauLisse.interpolate({
+    inputRange: [0, 1],
+    outputRange: [1, 1.16]
+  })), souffle.interpolate({
+    inputRange: [0, 1],
+    outputRange: [1, 1.1]
+  }));
+  const enfoncement = appui.interpolate({
+    inputRange: [0, 1],
+    outputRange: [1, 0.86]
+  });
+  const rayonBase = DISQUE / 2;
+  const rayonRepos = DISQUE / 2 * ECHELLE_REPOS;
+  return /*#__PURE__*/_jsxs(Pressable, {
+    accessibilityRole: "button",
+    accessibilityLabel: tooltip,
+    accessibilityState: {
+      selected: ecoute
+    },
+    onPressIn: () => Animated.timing(appui, {
+      toValue: 1,
+      duration: 90,
+      useNativeDriver: true
+    }).start(),
+    onPressOut: () => Animated.timing(appui, {
+      toValue: 0,
+      duration: 160,
+      useNativeDriver: true
+    }).start(),
+    onPress: toucher,
+    style: styles.zone,
+    children: [!animationsReduites && /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(Animated.View, {
+        pointerEvents: "none",
+        style: [styles.onde, {
+          width: rayonRepos * 2,
+          height: rayonRepos * 2,
+          borderRadius: rayonRepos,
+          backgroundColor: couleur,
+          opacity: Animated.multiply(invitation.interpolate({
+            inputRange: [0, 0.01, 0.5, 1],
+            outputRange: [0, 0.4, 0.1, 0]
+          }), presence.interpolate({
+            inputRange: [0, 1],
+            outputRange: [1, 0]
+          })),
+          transform: [{
+            scale: easeOutQuad(invitation).interpolate({
+              inputRange: [0, 1],
+              outputRange: [1, (rayonRepos + 10) / rayonRepos]
+            })
+          }]
+        }]
+      }), ondes.map((onde, i) => /*#__PURE__*/_jsx(Animated.View, {
+        pointerEvents: "none",
+        style: [styles.onde, {
+          width: DISQUE,
+          height: DISQUE,
+          borderRadius: rayonBase,
+          backgroundColor: couleur,
+          opacity: Animated.multiply(Animated.multiply(onde.interpolate({
+            inputRange: [0, 0.5, 1],
+            outputRange: [0.5, 0.125, 0]
+          }), presence), niveauLisse.interpolate({
+            inputRange: [0, 1],
+            outputRange: [0.45, 1]
+          })),
+          transform: [{
+            scale: Animated.add(1, Animated.multiply(easeOutQuad(onde), niveauLisse.interpolate({
+              inputRange: [0, 1],
+              outputRange: [6 / rayonBase, 16 / rayonBase]
+            })))
+          }]
+        }]
+      }, i))]
+    }), /*#__PURE__*/_jsxs(Animated.View, {
+      style: [styles.centre, {
+        transform: [{
+          scale: enfoncement
+        }]
+      }],
+      children: [/*#__PURE__*/_jsxs(Animated.View, {
+        style: [styles.disque, {
+          transform: [{
+            scale: echelle
+          }]
+        }],
+        children: [/*#__PURE__*/_jsx(Animated.View, {
+          style: [StyleSheet.absoluteFill, styles.rond, {
+            backgroundColor: couleur,
+            opacity: souffle.interpolate({
+              inputRange: [0, 1],
+              outputRange: [0.12, 0.2]
+            })
+          }]
+        }), /*#__PURE__*/_jsx(Animated.View, {
+          style: [StyleSheet.absoluteFill, styles.rond, {
+            backgroundColor: couleur,
+            opacity: presence
+          }]
+        })]
+      }), /*#__PURE__*/_jsx(Animated.View, {
+        style: [styles.icone, {
+          opacity: presence.interpolate({
+            inputRange: [0, 1],
+            outputRange: [1, 0]
+          })
+        }],
+        children: /*#__PURE__*/_jsx(MaterialIcons, {
+          name: "mic-none",
+          size: 20,
+          color: couleur
+        })
+      }), /*#__PURE__*/_jsx(Animated.View, {
+        style: [styles.icone, {
+          opacity: presence,
+          transform: [{
+            scale: presence
+          }]
+        }],
+        children: /*#__PURE__*/_jsx(MaterialIcons, {
+          name: "mic",
+          size: 20,
+          color: surCouleur
+        })
+      })]
+    })]
+  });
+}
+
+/**
+ * Courbe `Easing.out(Easing.quad)` (1 - (1 - t)²) appliquée à une valeur
+ * de 0 à 1, décrite point par point : `interpolate` n'accepte pas d'option
+ * `easing`, et le pilote natif rejette l'animation (erreur « Interpolation
+ * property 'easing' is not supported by native animated module » à chaque
+ * image).
+ */
+function easeOutQuad(valeur) {
+  return valeur.interpolate({
+    inputRange: [0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1],
+    outputRange: [0, 0.234375, 0.4375, 0.609375, 0.75, 0.859375, 0.9375, 0.984375, 1]
+  });
+}
+
+/** Réglage « réduire les animations » du téléphone ; `undefined` tant qu'il n'est pas lu. */
+function useAnimationsReduites() {
+  const [reduites, setReduites] = useState(undefined);
+  useEffect(() => {
+    let actif = true;
+    void AccessibilityInfo.isReduceMotionEnabled().then(valeur => {
+      if (actif) setReduites(valeur);
+    });
+    const abonnement = AccessibilityInfo.addEventListener('reduceMotionChanged', setReduites);
+    return () => {
+      actif = false;
+      abonnement.remove();
+    };
+  }, []);
+  return reduites;
+}
+const styles = StyleSheet.create({
+  zone: {
+    width: TAILLE,
+    height: TAILLE,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  onde: {
+    position: 'absolute'
+  },
+  centre: {
+    width: DISQUE,
+    height: DISQUE,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  disque: {
+    position: 'absolute',
+    width: DISQUE,
+    height: DISQUE
+  },
+  rond: {
+    borderRadius: DISQUE / 2
+  },
+  icone: {
+    position: 'absolute'
+  }
+});
+//# sourceMappingURL=search_page_voice_button.js.map

package/lib/module/modules/search/presentation/pages/search_page_voice_button.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MaterialIcons","useEffect","useRef","useState","AccessibilityInfo","Animated","Easing","Platform","Pressable","StyleSheet","Vibration","useTheme","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","TAILLE","DISQUE","ECHELLE_REPOS","CYCLE_ONDES","NOMBRE_ONDES","SearchPageVoiceButton","ecoute","niveau","onPress","tooltip","theme","couleur","colorScheme","primary","surCouleur","onPrimary","animationsReduites","useAnimationsReduites","entree","Value","current","appui","invitation","niveauLisse","ondes","Array","from","length","setValue","animation","spring","toValue","friction","tension","useNativeDriver","timing","duration","easing","in","cubic","start","stop","boucles","map","onde","i","sequence","delay","loop","linear","forEach","boucle","suivre","Math","min","max","value","addListener","invitationLancee","pulsation","toucher","OS","vibrate","presence","interpolate","inputRange","outputRange","extrapolate","souffle","echelle","multiply","enfoncement","rayonBase","rayonRepos","accessibilityRole","accessibilityLabel","accessibilityState","selected","onPressIn","onPressOut","style","styles","zone","children","View","pointerEvents","width","height","borderRadius","backgroundColor","opacity","transform","scale","easeOutQuad","add","centre","disque","absoluteFill","rond","icone","name","size","color","valeur","reduites","setReduites","undefined","actif","isReduceMotionEnabled","then","abonnement","addEventListener","remove","create","alignItems","justifyContent","position"],"sourceRoot":"../../../../../../src","sources":["modules/search/presentation/pages/search_page_voice_button.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/subscription/presentation/pages/subscription_menu_widget.js

@@ -7,7 +7,7 @@ import { AppRouter, useAppRouter } from "../../../../core/router.js";
 import { useTheme } from "../../../../core/theme.js";
 import { useAppLocalizations } from "../../../../l10n/localizations.js";
 import { Card } from "../../../../shared/material/card.js";
-import { MenuActionItem, MenuActionsWiget } from "../../../../shared/widgets/menu_actions_widget.js";
+import { MenuActionItem, MenuActionsWidget } from "../../../../shared/widgets/menu_actions_widget.js";
 
 /** Menu de création : programmer un paiement ou souscrire à un abonnement (feuille du bas) */
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -19,6 +19,11 @@ export function SubscriptionMenuWidget() {
     height
   } = useWindowDimensions();
   const insets = useSafeAreaInsets();
+  // Fermer le menu avant d'ouvrir la page : sinon il reste affiché par-dessus
+  const open = location => {
+    AppRouter.pop(router);
+    void AppRouter.push(router, location);
+  };
   return /*#__PURE__*/_jsx(View, {
     style: [styles.box, {
       maxHeight: height * 0.4,
@@ -34,14 +39,14 @@ export function SubscriptionMenuWidget() {
       }), /*#__PURE__*/_jsx(View, {
         style: styles.gap20
       }), /*#__PURE__*/_jsx(Card, {
-        children: /*#__PURE__*/_jsx(MenuActionsWiget, {
+        children: /*#__PURE__*/_jsx(MenuActionsWidget, {
           items: [
           // Programmer
-          new MenuActionItem(Images.homeFooterTransfer, traductions.subscriptionMenuScheduleTitle, traductions.subscriptionMenuScheduleSubtitle, () => void AppRouter.push(router, AppRouter.subscriptionSchedule), {
+          new MenuActionItem(Images.homeFooterTransfer, traductions.subscriptionMenuScheduleTitle, traductions.subscriptionMenuScheduleSubtitle, () => open(AppRouter.subscriptionSchedule), {
             iconSize: 20
           }),
           // Souscrire à un abonnement
-          new MenuActionItem(Images.iconRepeat, traductions.subscriptionMenuSubscribeTitle, traductions.subscriptionMenuSubscribeSubtitle, () => void AppRouter.push(router, AppRouter.subscriptionSubscribe), {
+          new MenuActionItem(Images.iconRepeat, traductions.subscriptionMenuSubscribeTitle, traductions.subscriptionMenuSubscribeSubtitle, () => open(AppRouter.subscriptionSubscribe), {
             iconSize: 20
           })]
         })

package/lib/module/modules/subscription/presentation/pages/subscription_menu_widget.js.map

@@ -1 +1 @@
-{"version":3,"names":["ScrollView","StyleSheet","Text","useWindowDimensions","View","useSafeAreaInsets","Images","AppRouter","useAppRouter","useTheme","useAppLocalizations","Card","MenuActionItem","MenuActionsWiget","jsx","_jsx","jsxs","_jsxs","SubscriptionMenuWidget","traductions","theme","router","height","insets","style","styles","box","maxHeight","backgroundColor","colorScheme","surface","children","contentContainerStyle","content","paddingBottom","bottom","textTheme","headlineMedium","subscriptionEmptyBtnCreate","gap20","items","homeFooterTransfer","subscriptionMenuScheduleTitle","subscriptionMenuScheduleSubtitle","push","subscriptionSchedule","iconSize","iconRepeat","subscriptionMenuSubscribeTitle","subscriptionMenuSubscribeSubtitle","subscriptionSubscribe","create","borderRadius","overflow","padding"],"sourceRoot":"../../../../../../src","sources":["modules/subscription/presentation/pages/subscription_menu_widget.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,UAAU,EAAEC,IAAI,EAAEC,mBAAmB,EAAEC,IAAI,QAAQ,cAAc;AACtF,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,MAAM,QAAQ,4BAAyB;AAChD,SAASC,SAAS,EAAEC,YAAY,QAAQ,4BAAyB;AACjE,SAASC,QAAQ,QAAQ,2BAAwB;AACjD,SAASC,mBAAmB,QAAQ,mCAAgC;AACpE,SAASC,IAAI,QAAQ,qCAAkC;AACvD,SAASC,cAAc,EAAEC,gBAAgB,QAAQ,mDAAgD;;AAEjG;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AACA,OAAO,SAASC,sBAAsBA,CAAA,EAAG;EACvC,MAAMC,WAAW,GAAGT,mBAAmB,CAAC,CAAC;EACzC,MAAMU,KAAK,GAAGX,QAAQ,CAAC,CAAC;EACxB,MAAMY,MAAM,GAAGb,YAAY,CAAC,CAAC;EAC7B,MAAM;IAAEc;EAAO,CAAC,GAAGnB,mBAAmB,CAAC,CAAC;EACxC,MAAMoB,MAAM,GAAGlB,iBAAiB,CAAC,CAAC;EAClC,oBACEU,IAAA,CAACX,IAAI;IAACoB,KAAK,EAAE,CAACC,MAAM,CAACC,GAAG,EAAE;MAAEC,SAAS,EAAEL,MAAM,GAAG,GAAG;MAAEM,eAAe,EAAER,KAAK,CAACS,WAAW,CAACC;IAAQ,CAAC,CAAE;IAAAC,QAAA,eACjGd,KAAA,CAACjB,UAAU;MAACgC,qBAAqB,EAAE,CAACP,MAAM,CAACQ,OAAO,EAAE;QAAEC,aAAa,EAAE,EAAE,GAAGX,MAAM,CAACY;MAAO,CAAC,CAAE;MAAAJ,QAAA,gBAEzFhB,IAAA,CAACb,IAAI;QAACsB,KAAK,EAAEJ,KAAK,CAACgB,SAAS,CAACC,cAAe;QAAAN,QAAA,EAAEZ,WAAW,CAACmB;MAA0B,CAAO,CAAC,eAC5FvB,IAAA,CAACX,IAAI;QAACoB,KAAK,EAAEC,MAAM,CAACc;MAAM,CAAE,CAAC,eAC7BxB,IAAA,CAACJ,IAAI;QAAAoB,QAAA,eACHhB,IAAA,CAACF,gBAAgB;UACf2B,KAAK,EAAE;UACL;UACA,IAAI5B,cAAc,CAChBN,MAAM,CAACmC,kBAAkB,EACzBtB,WAAW,CAACuB,6BAA6B,EACzCvB,WAAW,CAACwB,gCAAgC,EAC5C,MAAM,KAAKpC,SAAS,CAACqC,IAAI,CAACvB,MAAM,EAAEd,SAAS,CAACsC,oBAAoB,CAAC,EACjE;YAAEC,QAAQ,EAAE;UAAG,CACjB,CAAC;UACD;UACA,IAAIlC,cAAc,CAChBN,MAAM,CAACyC,UAAU,EACjB5B,WAAW,CAAC6B,8BAA8B,EAC1C7B,WAAW,CAAC8B,iCAAiC,EAC7C,MAAM,KAAK1C,SAAS,CAACqC,IAAI,CAACvB,MAAM,EAAEd,SAAS,CAAC2C,qBAAqB,CAAC,EAClE;YAAEJ,QAAQ,EAAE;UAAG,CACjB,CAAC;QACD,CACH;MAAC,CACE,CAAC;IAAA,CACG;EAAC,CACT,CAAC;AAEX;AAEA,MAAMrB,MAAM,GAAGxB,UAAU,CAACkD,MAAM,CAAC;EAC/BzB,GAAG,EAAE;IAAE0B,YAAY,EAAE,EAAE;IAAEC,QAAQ,EAAE;EAAS,CAAC;EAC7CpB,OAAO,EAAE;IAAEqB,OAAO,EAAE;EAAG,CAAC;EACxBf,KAAK,EAAE;IAAEjB,MAAM,EAAE;EAAG;AACtB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["ScrollView","StyleSheet","Text","useWindowDimensions","View","useSafeAreaInsets","Images","AppRouter","useAppRouter","useTheme","useAppLocalizations","Card","MenuActionItem","MenuActionsWidget","jsx","_jsx","jsxs","_jsxs","SubscriptionMenuWidget","traductions","theme","router","height","insets","open","location","pop","push","style","styles","box","maxHeight","backgroundColor","colorScheme","surface","children","contentContainerStyle","content","paddingBottom","bottom","textTheme","headlineMedium","subscriptionEmptyBtnCreate","gap20","items","homeFooterTransfer","subscriptionMenuScheduleTitle","subscriptionMenuScheduleSubtitle","subscriptionSchedule","iconSize","iconRepeat","subscriptionMenuSubscribeTitle","subscriptionMenuSubscribeSubtitle","subscriptionSubscribe","create","borderRadius","overflow","padding"],"sourceRoot":"../../../../../../src","sources":["modules/subscription/presentation/pages/subscription_menu_widget.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,UAAU,EAAEC,IAAI,EAAEC,mBAAmB,EAAEC,IAAI,QAAQ,cAAc;AACtF,SAASC,iBAAiB,QAAQ,gCAAgC;AAElE,SAASC,MAAM,QAAQ,4BAAyB;AAChD,SAASC,SAAS,EAAEC,YAAY,QAAQ,4BAAyB;AACjE,SAASC,QAAQ,QAAQ,2BAAwB;AACjD,SAASC,mBAAmB,QAAQ,mCAAgC;AACpE,SAASC,IAAI,QAAQ,qCAAkC;AACvD,SAASC,cAAc,EAAEC,iBAAiB,QAAQ,mDAAgD;;AAElG;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AACA,OAAO,SAASC,sBAAsBA,CAAA,EAAG;EACvC,MAAMC,WAAW,GAAGT,mBAAmB,CAAC,CAAC;EACzC,MAAMU,KAAK,GAAGX,QAAQ,CAAC,CAAC;EACxB,MAAMY,MAAM,GAAGb,YAAY,CAAC,CAAC;EAC7B,MAAM;IAAEc;EAAO,CAAC,GAAGnB,mBAAmB,CAAC,CAAC;EACxC,MAAMoB,MAAM,GAAGlB,iBAAiB,CAAC,CAAC;EAClC;EACA,MAAMmB,IAAI,GAAIC,QAAgB,IAAK;IACjClB,SAAS,CAACmB,GAAG,CAACL,MAAM,CAAC;IACrB,KAAKd,SAAS,CAACoB,IAAI,CAACN,MAAM,EAAEI,QAAQ,CAAC;EACvC,CAAC;EACD,oBACEV,IAAA,CAACX,IAAI;IAACwB,KAAK,EAAE,CAACC,MAAM,CAACC,GAAG,EAAE;MAAEC,SAAS,EAAET,MAAM,GAAG,GAAG;MAAEU,eAAe,EAAEZ,KAAK,CAACa,WAAW,CAACC;IAAQ,CAAC,CAAE;IAAAC,QAAA,eACjGlB,KAAA,CAACjB,UAAU;MAACoC,qBAAqB,EAAE,CAACP,MAAM,CAACQ,OAAO,EAAE;QAAEC,aAAa,EAAE,EAAE,GAAGf,MAAM,CAACgB;MAAO,CAAC,CAAE;MAAAJ,QAAA,gBAEzFpB,IAAA,CAACb,IAAI;QAAC0B,KAAK,EAAER,KAAK,CAACoB,SAAS,CAACC,cAAe;QAAAN,QAAA,EAAEhB,WAAW,CAACuB;MAA0B,CAAO,CAAC,eAC5F3B,IAAA,CAACX,IAAI;QAACwB,KAAK,EAAEC,MAAM,CAACc;MAAM,CAAE,CAAC,eAC7B5B,IAAA,CAACJ,IAAI;QAAAwB,QAAA,eACHpB,IAAA,CAACF,iBAAiB;UAChB+B,KAAK,EAAE;UACL;UACA,IAAIhC,cAAc,CAChBN,MAAM,CAACuC,kBAAkB,EACzB1B,WAAW,CAAC2B,6BAA6B,EACzC3B,WAAW,CAAC4B,gCAAgC,EAC5C,MAAMvB,IAAI,CAACjB,SAAS,CAACyC,oBAAoB,CAAC,EAC1C;YAAEC,QAAQ,EAAE;UAAG,CACjB,CAAC;UACD;UACA,IAAIrC,cAAc,CAChBN,MAAM,CAAC4C,UAAU,EACjB/B,WAAW,CAACgC,8BAA8B,EAC1ChC,WAAW,CAACiC,iCAAiC,EAC7C,MAAM5B,IAAI,CAACjB,SAAS,CAAC8C,qBAAqB,CAAC,EAC3C;YAAEJ,QAAQ,EAAE;UAAG,CACjB,CAAC;QACD,CACH;MAAC,CACE,CAAC;IAAA,CACG;EAAC,CACT,CAAC;AAEX;AAEA,MAAMpB,MAAM,GAAG5B,UAAU,CAACqD,MAAM,CAAC;EAC/BxB,GAAG,EAAE;IAAEyB,YAAY,EAAE,EAAE;IAAEC,QAAQ,EAAE;EAAS,CAAC;EAC7CnB,OAAO,EAAE;IAAEoB,OAAO,EAAE;EAAG,CAAC;EACxBd,KAAK,EAAE;IAAErB,MAAM,EAAE;EAAG;AACtB,CAAC,CAAC","ignoreList":[]}

package/lib/module/modules/transactions/presentation/bloc/transaction_search/transaction_search_bloc.js

@@ -48,8 +48,12 @@ export class TransactionSearchBloc extends Bloc {
   /** Quand on demande la liste des transactions */
   async onList(event, emit) {
     emit(new TransactionSearchLoadingState(this.state.transactions, event.command));
+
+    // Repartir de la première page
+    const command = event.command;
+    command.index = null;
+    command.total = 0;
     try {
-      const command = event.command;
       // Rechercher d'abord en local et afficher
       const donneesLocales = await this.transactionsInputPort.list(this.params(command));
       if (command.filters.categories.length > 0) {
@@ -74,19 +78,27 @@ export class TransactionSearchBloc extends Bloc {
 
   /** Pagination */
   async onPaginate(event, emit) {
+    // Une page est déjà en cours de chargement
+    const current = this.state;
+    if (!(current instanceof TransactionSearchListState) || current.isPaginating) return;
     const command = event.command;
+    // Affiche le loader en bas de la liste
+    emit(new TransactionSearchListState(current.transactions, command, true));
     try {
       const liste = await this.transactionsInputPort.search(this.params(command, command.index));
       command.total = liste.meta.total;
       command.index = liste.meta.next;
       if (liste.isNotEmpty) {
         emit(new TransactionSearchListState(new TransactionListe([...this.state.transactions.data, ...liste.data], liste.meta), command));
+        return;
       }
     } catch (e) {
       this.logger.e('Recuperer liste transaction pagination error =>', {
         error: e
       });
     }
+    // Page vide ou erreur : on retire le loader
+    emit(new TransactionSearchListState(this.state.transactions, command));
   }
 }
 //# sourceMappingURL=transaction_search_bloc.js.map

package/lib/module/modules/transactions/presentation/bloc/transaction_search/transaction_search_bloc.js.map

@@ -1 +1 @@
-{"version":3,"names":["Bloc","Logger","ListeMeta","TransactionListe","TransactionSearchCommand","TransactionSearchFilter","TransactionSearchListEvent","TransactionSearchPaginateEvent","TransactionSearchInitialState","TransactionSearchListState","TransactionSearchLoadingState","TransactionSearchBloc","logger","constructor","transactionsInputPort","total","limit","defaultLimit","filters","categories","sens","on","e","emit","onList","onPaginate","params","command","page","dates","compte","map","s","dateOperationDebut","start","dateOperationFin","end","keyword","keyWord","event","state","transactions","donneesLocales","list","length","isNotEmpty","liste","search","index","isEmpty","meta","next","error","data"],"sourceRoot":"../../../../../../../src","sources":["modules/transactions/presentation/bloc/transaction_search/transaction_search_bloc.ts"],"mappings":";;AAAA,SAASA,IAAI,QAAsB,6BAA0B;AAC7D,SAASC,MAAM,QAAQ,+BAA4B;AACnD,SAASC,SAAS,QAAQ,4CAAyC;AACnE,SAASC,gBAAgB,QAAQ,6CAA0C;AAC3E,SAASC,wBAAwB,QAAQ,yEAAsE;AAC/G,SAASC,uBAAuB,QAAQ,wEAAqE;AAG7G,SAASC,0BAA0B,EAAEC,8BAA8B,QAAqC,+BAA4B;AACpI,SACEC,6BAA6B,EAC7BC,0BAA0B,EAC1BC,6BAA6B,QAExB,+BAA4B;;AAEnC;AACA,OAAO,MAAMC,qBAAqB,SAASX,IAAI,CAAiD;EACrFY,MAAM,GAAG,IAAIX,MAAM,CAAC,CAAC;EAE9BY,WAAWA,CAAUC,qBAA2C,EAAE;IAChE,KAAK,CACH,IAAIN,6BAA6B,CAC/B,IAAIL,gBAAgB,CAAC,EAAE,EAAE,IAAID,SAAS,CAAC;MAAEa,KAAK,EAAE,CAAC;MAAEC,KAAK,EAAEZ,wBAAwB,CAACa;IAAa,CAAC,CAAC,CAAC,EACnG,IAAIb,wBAAwB,CAAC;MAC3Bc,OAAO,EAAE,IAAIb,uBAAuB,CAAC;QAAEc,UAAU,EAAE,EAAE;QAAEC,IAAI,EAAE;MAAG,CAAC,CAAC;MAClEJ,KAAK,EAAEZ,wBAAwB,CAACa;IAClC,CAAC,CACH,CACF,CAAC;IACD;IAAA,KAVmBH,qBAA2C,GAA3CA,qBAA2C;IAW9D,IAAI,CAACO,EAAE,CAACf,0BAA0B,EAAE,CAACgB,CAAC,EAAEC,IAAI,KAAK,IAAI,CAACC,MAAM,CAACF,CAAC,EAAEC,IAAI,CAAC,CAAC;IACtE;IACA,IAAI,CAACF,EAAE,CAACd,8BAA8B,EAAE,CAACe,CAAC,EAAEC,IAAI,KAAK,IAAI,CAACE,UAAU,CAACH,CAAC,EAAEC,IAAI,CAAC,CAAC;EAChF;;EAEA;EACQG,MAAMA,CAACC,OAAiC,EAAEC,IAA6B,EAAyB;IACtG,MAAMC,KAAK,GAAGF,OAAO,CAACT,OAAO,CAACW,KAAK,CAAC,CAAC;IACrC,OAAO;MACLC,MAAM,EAAEH,OAAO,CAACG,MAAO;MACvBd,KAAK,EAAEW,OAAO,CAACX,KAAK;MACpBY,IAAI;MACJR,IAAI,EAAEO,OAAO,CAACT,OAAO,CAACE,IAAI,CAACW,GAAG,CAAEC,CAAC,IAAKA,CAAC,CAAC;MACxCb,UAAU,EAAEQ,OAAO,CAACT,OAAO,CAACC,UAAU;MACtCc,kBAAkB,EAAEJ,KAAK,EAAEK,KAAK;MAChCC,gBAAgB,EAAEN,KAAK,EAAEO,GAAG;MAC5BC,OAAO,EAAEV,OAAO,CAACW;IACnB,CAAC;EACH;;EAEA;EACA,MAAcd,MAAMA,CAACe,KAAiC,EAAEhB,IAAqC,EAAiB;IAC5GA,IAAI,CAAC,IAAIb,6BAA6B,CAAC,IAAI,CAAC8B,KAAK,CAACC,YAAY,EAAEF,KAAK,CAACZ,OAAO,CAAC,CAAC;IAC/E,IAAI;MACF,MAAMA,OAAO,GAAGY,KAAK,CAACZ,OAAO;MAC7B;MACA,MAAMe,cAAc,GAAG,MAAM,IAAI,CAAC5B,qBAAqB,CAAC6B,IAAI,CAAC,IAAI,CAACjB,MAAM,CAACC,OAAO,CAAC,CAAC;MAClF,IAAIA,OAAO,CAACT,OAAO,CAACC,UAAU,CAACyB,MAAM,GAAG,CAAC,EAAE;QACzC;QACArB,IAAI,CAAC,IAAId,0BAA0B,CAACiC,cAAc,EAAEf,OAAO,CAAC,CAAC;QAC7D;MACF;MACA,IAAIe,cAAc,CAACG,UAAU,EAAEtB,IAAI,CAAC,IAAId,0BAA0B,CAACiC,cAAc,EAAEf,OAAO,CAAC,CAAC;;MAE5F;MACA,MAAMmB,KAAK,GAAG,MAAM,IAAI,CAAChC,qBAAqB,CAACiC,MAAM,CAAC,IAAI,CAACrB,MAAM,CAACC,OAAO,EAAEA,OAAO,CAACqB,KAAK,CAAC,CAAC;MAC1F,IAAIN,cAAc,CAACG,UAAU,IAAIC,KAAK,CAACG,OAAO,EAAE;MAChDtB,OAAO,CAACZ,KAAK,GAAG+B,KAAK,CAACI,IAAI,CAACnC,KAAK;MAChCY,OAAO,CAACqB,KAAK,GAAGF,KAAK,CAACI,IAAI,CAACC,IAA0C;MACrE5B,IAAI,CAAC,IAAId,0BAA0B,CAACqC,KAAK,EAAEnB,OAAO,CAAC,CAAC;IACtD,CAAC,CAAC,OAAOL,CAAC,EAAE;MACV,IAAI,CAACV,MAAM,CAACU,CAAC,CAAC,sCAAsC,EAAE;QAAE8B,KAAK,EAAE9B;MAAE,CAAC,CAAC;IACrE;EACF;;EAEA;EACA,MAAcG,UAAUA,CAACc,KAAqC,EAAEhB,IAAqC,EAAiB;IACpH,MAAMI,OAAO,GAAGY,KAAK,CAACZ,OAAO;IAC7B,IAAI;MACF,MAAMmB,KAAK,GAAG,MAAM,IAAI,CAAChC,qBAAqB,CAACiC,MAAM,CAAC,IAAI,CAACrB,MAAM,CAACC,OAAO,EAAEA,OAAO,CAACqB,KAAK,CAAC,CAAC;MAC1FrB,OAAO,CAACZ,KAAK,GAAG+B,KAAK,CAACI,IAAI,CAACnC,KAAK;MAChCY,OAAO,CAACqB,KAAK,GAAGF,KAAK,CAACI,IAAI,CAACC,IAA0C;MACrE,IAAIL,KAAK,CAACD,UAAU,EAAE;QACpBtB,IAAI,CAAC,IAAId,0BAA0B,CAAC,IAAIN,gBAAgB,CAAC,CAAC,GAAG,IAAI,CAACqC,KAAK,CAACC,YAAY,CAACY,IAAI,EAAE,GAAGP,KAAK,CAACO,IAAI,CAAC,EAAEP,KAAK,CAACI,IAAI,CAAC,EAAEvB,OAAO,CAAC,CAAC;MACnI;IACF,CAAC,CAAC,OAAOL,CAAC,EAAE;MACV,IAAI,CAACV,MAAM,CAACU,CAAC,CAAC,iDAAiD,EAAE;QAAE8B,KAAK,EAAE9B;MAAE,CAAC,CAAC;IAChF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["Bloc","Logger","ListeMeta","TransactionListe","TransactionSearchCommand","TransactionSearchFilter","TransactionSearchListEvent","TransactionSearchPaginateEvent","TransactionSearchInitialState","TransactionSearchListState","TransactionSearchLoadingState","TransactionSearchBloc","logger","constructor","transactionsInputPort","total","limit","defaultLimit","filters","categories","sens","on","e","emit","onList","onPaginate","params","command","page","dates","compte","map","s","dateOperationDebut","start","dateOperationFin","end","keyword","keyWord","event","state","transactions","index","donneesLocales","list","length","isNotEmpty","liste","search","isEmpty","meta","next","error","current","isPaginating","data"],"sourceRoot":"../../../../../../../src","sources":["modules/transactions/presentation/bloc/transaction_search/transaction_search_bloc.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/transactions/presentation/bloc/transaction_search/transaction_search_state.js

@@ -8,5 +8,11 @@ export class TransactionSearchState {
 }
 export class TransactionSearchInitialState extends TransactionSearchState {}
 export class TransactionSearchLoadingState extends TransactionSearchState {}
-export class TransactionSearchListState extends TransactionSearchState {}
+export class TransactionSearchListState extends TransactionSearchState {
+  constructor(transactions, command, /** true pendant le chargement de la page suivante : un petit loader est affiché en bas de la liste. */
+  isPaginating = false) {
+    super(transactions, command);
+    this.isPaginating = isPaginating;
+  }
+}
 //# sourceMappingURL=transaction_search_state.js.map

package/lib/module/modules/transactions/presentation/bloc/transaction_search/transaction_search_state.js.map

@@ -1 +1 @@
-{"version":3,"names":["TransactionSearchState","constructor","transactions","command","TransactionSearchInitialState","TransactionSearchLoadingState","TransactionSearchListState"],"sourceRoot":"../../../../../../../src","sources":["modules/transactions/presentation/bloc/transaction_search/transaction_search_state.ts"],"mappings":";;AAGA,OAAO,MAAeA,sBAAsB,CAAC;EAC3CC,WAAWA,CACAC,YAA8B,EAC9BC,OAAiC,EAC1C;IAAA,KAFSD,YAA8B,GAA9BA,YAA8B;IAAA,KAC9BC,OAAiC,GAAjCA,OAAiC;EACzC;AACL;AAEA,OAAO,MAAMC,6BAA6B,SAASJ,sBAAsB,CAAC;AAE1E,OAAO,MAAMK,6BAA6B,SAASL,sBAAsB,CAAC;AAE1E,OAAO,MAAMM,0BAA0B,SAASN,sBAAsB,CAAC","ignoreList":[]}
+{"version":3,"names":["TransactionSearchState","constructor","transactions","command","TransactionSearchInitialState","TransactionSearchLoadingState","TransactionSearchListState","isPaginating"],"sourceRoot":"../../../../../../../src","sources":["modules/transactions/presentation/bloc/transaction_search/transaction_search_state.ts"],"mappings":";;AAGA,OAAO,MAAeA,sBAAsB,CAAC;EAC3CC,WAAWA,CACAC,YAA8B,EAC9BC,OAAiC,EAC1C;IAAA,KAFSD,YAA8B,GAA9BA,YAA8B;IAAA,KAC9BC,OAAiC,GAAjCA,OAAiC;EACzC;AACL;AAEA,OAAO,MAAMC,6BAA6B,SAASJ,sBAAsB,CAAC;AAE1E,OAAO,MAAMK,6BAA6B,SAASL,sBAAsB,CAAC;AAE1E,OAAO,MAAMM,0BAA0B,SAASN,sBAAsB,CAAC;EACrEC,WAAWA,CACTC,YAA8B,EAC9BC,OAAiC,EACjC;EACSI,YAAY,GAAG,KAAK,EAC7B;IACA,KAAK,CAACL,YAAY,EAAEC,OAAO,CAAC;IAAC,KAFpBI,YAAY,GAAZA,YAAY;EAGvB;AACF","ignoreList":[]}