@mtes-mct/monitor-ui 24.2.0 → 24.3.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [24.2.1](https://github.com/MTES-MCT/monitor-ui/compare/v24.2.0...v24.2.1) (2024-10-18)
+
+
+### Code Refactoring
+
+* **fields:** move eslint disable ([1c1533a](https://github.com/MTES-MCT/monitor-ui/commit/1c1533af36f8180c6921d71a137f537256a70e1f))
+* **fields:** rename props ([e6ef3de](https://github.com/MTES-MCT/monitor-ui/commit/e6ef3de40c22f596abe24c99cea8f5d4db481569))
+
+## [24.2.0](https://github.com/MTES-MCT/monitor-ui/compare/v24.1.1...v24.2.0) (2024-10-18)
+
+
+### Features
+
+* **fields:** add hasFullDayDefaultValue to date range picker ([5adc234](https://github.com/MTES-MCT/monitor-ui/commit/5adc2340b42aabe02b496ee2044957d47b4027c3))
+
+
+### Code Refactoring
+
+* **fields:** add early return ([af9360b](https://github.com/MTES-MCT/monitor-ui/commit/af9360b4bb35584f2705524f2d425b5bcb4fd4e8))
+
 ## [24.1.1](https://github.com/MTES-MCT/monitor-ui/compare/v24.1.0...v24.1.1) (2024-10-16)
 
 

package/fields/DateRangePicker/index.d.ts

@@ -33,7 +33,6 @@ export interface DateRangePickerProps extends Omit<HTMLAttributes<HTMLFieldSetEl
     defaultValue?: DateRange | DateAsStringRange | undefined;
     disabled?: boolean | undefined;
     error?: string | undefined;
-    hasFullDayDefaultValue?: boolean;
     hasSingleCalendar?: boolean;
     isCompact?: boolean | undefined;
     isErrorMessageHidden?: boolean | undefined;
@@ -61,6 +60,7 @@ export interface DateRangePickerProps extends Omit<HTMLAttributes<HTMLFieldSetEl
      */
     onChange?: ((nextValue: DateRange | undefined) => Promisable<void>) | ((nextValue: DateAsStringRange | undefined) => Promisable<void>);
     readOnly?: boolean;
+    withFullDayDefaults?: boolean;
     withTime?: boolean;
 }
 export interface DateRangePickerWithDateDateProps extends DateRangePickerProps {

package/fields/DateRangePicker/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/fields/DateRangePicker/index.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAkCH,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,WAAW,oBACf,SAAQ,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE,cAAc,GAAG,UAAU,GAAG,aAAa,CAAC;IAC9F,gHAAgH;IAChH,aAAa,CAAC,EAAE,QAAQ,GAAG,cAAc,GAAG,IAAI,GAAG,SAAS,CAAA;IAC5D,YAAY,CAAC,EAAE,SAAS,GAAG,iBAAiB,GAAG,SAAS,CAAA;IACxD,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC9B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC/B,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC1C,yCAAyC;IACzC,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACnC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAChC,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACnC,uBAAuB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7C,KAAK,EAAE,MAAM,CAAA;IACb;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,QAAQ,CAAC,EACL,CAAC,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,GACxD,CAAC,CAAC,SAAS,EAAE,iBAAiB,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AACD,MAAM,WAAW,gCAAiC,SAAQ,oBAAoB;IAC5E,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAA;CAClE;AACD,MAAM,WAAW,kCAAmC,SAAQ,oBAAoB;IAC9E,YAAY,EAAE,IAAI,CAAA;IAClB,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,iBAAiB,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAA;CAC1E;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,gCAAgC,GAAG,GAAG,CAAC,OAAO,CAAA;AACrF,wBAAgB,eAAe,CAAC,KAAK,EAAE,kCAAkC,GAAG,GAAG,CAAC,OAAO,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/fields/DateRangePicker/index.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAkCH,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,WAAW,oBACf,SAAQ,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE,cAAc,GAAG,UAAU,GAAG,aAAa,CAAC;IAC9F,gHAAgH;IAChH,aAAa,CAAC,EAAE,QAAQ,GAAG,cAAc,GAAG,IAAI,GAAG,SAAS,CAAA;IAC5D,YAAY,CAAC,EAAE,SAAS,GAAG,iBAAiB,GAAG,SAAS,CAAA;IACxD,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC9B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC/B,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC1C,yCAAyC;IACzC,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACnC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7B,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAChC,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACnC,uBAAuB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7C,KAAK,EAAE,MAAM,CAAA;IACb;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ;;;;OAIG;IACH,QAAQ,CAAC,EACL,CAAC,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,GACxD,CAAC,CAAC,SAAS,EAAE,iBAAiB,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AACD,MAAM,WAAW,gCAAiC,SAAQ,oBAAoB;IAC5E,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAA;CAClE;AACD,MAAM,WAAW,kCAAmC,SAAQ,oBAAoB;IAC9E,YAAY,EAAE,IAAI,CAAA;IAClB,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,iBAAiB,GAAG,SAAS,KAAK,UAAU,CAAC,IAAI,CAAC,CAAA;CAC1E;AAGD,wBAAgB,eAAe,CAAC,KAAK,EAAE,gCAAgC,GAAG,GAAG,CAAC,OAAO,CAAA;AACrF,wBAAgB,eAAe,CAAC,KAAK,EAAE,kCAAkC,GAAG,GAAG,CAAC,OAAO,CAAA"}

package/index.js

@@ -67323,8 +67323,8 @@ var DateRangePosition = /*#__PURE__*/ function(DateRangePosition) {
     return DateRangePosition;
 }({});
 
-function DateRangePicker({ baseContainer, className, defaultValue, disabled = false, error, hasFullDayDefaultValue = false, hasSingleCalendar = false, isCompact = false, isErrorMessageHidden = false, isHistorical = false, isLabelHidden = false, isLight = false, isRequired = false, isStringDate = false, isTransparent = false, isUndefinedWhenDisabled = false, label, minutesRange = 15, name, onChange, // eslint-disable-next-line @typescript-eslint/naming-convention
-readOnly = false, style, withTime = false, ...nativeProps }) {
+function DateRangePicker({ baseContainer, className, defaultValue, disabled = false, error, hasSingleCalendar = false, isCompact = false, isErrorMessageHidden = false, isHistorical = false, isLabelHidden = false, isLight = false, isRequired = false, isStringDate = false, isTransparent = false, isUndefinedWhenDisabled = false, label, minutesRange = 15, name, onChange, // eslint-disable-next-line @typescript-eslint/naming-convention
+readOnly = false, style, withFullDayDefaults = false, withTime = false, ...nativeProps }) {
     /* eslint-disable no-null/no-null */ const startDateInputRef = useRef(null);
     const startTimeInputRef = useRef(null);
     const endDateInputRef = useRef(null);
@@ -67422,13 +67422,13 @@ readOnly = false, style, withTime = false, ...nativeProps }) {
         forceUpdate
     ]);
     const handleEndDateInputNext = useCallback(()=>{
-        if (!withTime || !endTimeInputRef.current || hasFullDayDefaultValue) {
+        if (!withTime || !endTimeInputRef.current || withFullDayDefaults) {
             return;
         }
         endTimeInputRef.current.focus();
     }, [
         withTime,
-        hasFullDayDefaultValue
+        withFullDayDefaults
     ]);
     const handleEndDateInputPrevious = useCallback(()=>{
         if (!startDateInputRef.current) {
@@ -67446,19 +67446,19 @@ readOnly = false, style, withTime = false, ...nativeProps }) {
         if (!endDateInputRef.current) {
             return;
         }
-        if (withTime && !hasFullDayDefaultValue && startTimeInputRef.current) {
+        if (withTime && !withFullDayDefaults && startTimeInputRef.current) {
             startTimeInputRef.current.focus();
             return;
         }
         endDateInputRef.current.focus();
     }, [
         withTime,
-        hasFullDayDefaultValue
+        withFullDayDefaults
     ]);
     const handleDateInputChange = useCallback((position, nextDateTuple, isFilled)=>{
         if (position === DateRangePosition.START) {
             selectedStartDateTupleRef.current = nextDateTuple;
-            if (!withTime || withTime && hasFullDayDefaultValue || withTime && selectedStartTimeTupleRef.current) {
+            if (!withTime || withTime && withFullDayDefaults || withTime && selectedStartTimeTupleRef.current) {
                 // we update the selected start datetime
                 const startUtcTimeTuple = selectedStartTimeTupleRef.current ? selectedStartTimeTupleRef.current : [
                     '00',
@@ -67475,7 +67475,7 @@ readOnly = false, style, withTime = false, ...nativeProps }) {
             }
         } else {
             selectedEndDateTupleRef.current = nextDateTuple;
-            if (!withTime || withTime && hasFullDayDefaultValue || withTime && selectedEndTimeTupleRef.current) {
+            if (!withTime || withTime && withFullDayDefaults || withTime && selectedEndTimeTupleRef.current) {
                 // we update the selected end datetime
                 const endTimeTuple = selectedEndTimeTupleRef.current ? selectedEndTimeTupleRef.current : [
                     '23',
@@ -67487,7 +67487,7 @@ readOnly = false, style, withTime = false, ...nativeProps }) {
                 callOnChange();
             }
             if (isFilled) {
-                if (withTime && hasFullDayDefaultValue) {
+                if (withTime && withFullDayDefaults) {
                     closeRangeCalendarPicker();
                     forceUpdate();
                     return;
@@ -67498,7 +67498,7 @@ readOnly = false, style, withTime = false, ...nativeProps }) {
     }, [
         closeRangeCalendarPicker,
         forceUpdate,
-        hasFullDayDefaultValue,
+        withFullDayDefaults,
         withTime,
         callOnChange,
         handleEndDateInputNext,
@@ -67507,7 +67507,7 @@ readOnly = false, style, withTime = false, ...nativeProps }) {
     const handleRangeCalendarPickerChange = useCallback((nextUtcDateTupleRange)=>{
         const [nextStartUtcDateTuple, nextEndUtcDateTuple] = nextUtcDateTupleRange;
         // If there is NO time input,
-        if (!withTime || withTime && hasFullDayDefaultValue && !selectedStartTimeTupleRef.current && !selectedEndTimeTupleRef.current) {
+        if (!withTime || withTime && withFullDayDefaults && !selectedStartTimeTupleRef.current && !selectedEndTimeTupleRef.current) {
             // we have to fix the start datetime at the beginning of the day
             selectedStartDateTimeAsDayjsRef.current = getDayjsFromUtcDateAndTimeTuple(nextStartUtcDateTuple, [
                 '00',
@@ -67537,7 +67537,7 @@ readOnly = false, style, withTime = false, ...nativeProps }) {
     }, [
         callOnChange,
         closeRangeCalendarPicker,
-        hasFullDayDefaultValue,
+        withFullDayDefaults,
         withTime
     ]);
     const handleTimeInputChange = useCallback((position, nextTimeTuple)=>{
@@ -73834,7 +73834,6 @@ const Td$2 = styled.td.attrs((props)=>({
   font-size: 13px;
   font-weight: 500;
   line-height: 22px;
-  max-width: 0;
   overflow: hidden;
   padding: 9px 10px;
   text-align: ${(p)=>p.$isCenter ? 'center' : 'left'};
@@ -73967,7 +73966,7 @@ function Th$1({ children, header }) {
     }, header.id);
 }
 
-function DataTable({ columns, data, initialSorting }) {
+function DataTable({ columns, data, initialSorting, isTableHeadHidden = false, tableOptions }) {
     const [sorting, setSorting] = useState(initialSorting);
     const table = useReactTable({
         columns,
@@ -73979,7 +73978,8 @@ function DataTable({ columns, data, initialSorting }) {
         onSortingChange: setSorting,
         state: {
             sorting
-        }
+        },
+        ...tableOptions
     });
     const { rows } = table.getRowModel();
     return /*#__PURE__*/ jsxs(Fragment, {
@@ -73994,16 +73994,18 @@ function DataTable({ columns, data, initialSorting }) {
                     }),
                     data.length > 0 && /*#__PURE__*/ jsxs(SimpleTable.Table, {
                         children: [
-                            /*#__PURE__*/ jsx(SimpleTable.Head, {
+                            !isTableHeadHidden && /*#__PURE__*/ jsx(SimpleTable.Head, {
                                 children: table.getHeaderGroups().map((headerGroup)=>/*#__PURE__*/ jsx("tr", {
                                         children: headerGroup.headers.map((header)=>/*#__PURE__*/ jsx(Th$1, {
                                                 header: header
                                             }, header.id))
                                     }, headerGroup.id))
                             }),
-                            /*#__PURE__*/ jsx("tbody", {
-                                children: rows.map((row)=>/*#__PURE__*/ jsx(SimpleTable.BodyTr, {
-                                        "data-id": row.getValue('id'),
+                            /*#__PURE__*/ jsx(TBody, {
+                                $withTopBorder: isTableHeadHidden,
+                                children: rows.map((row)=>// `data-id` is expected by `cy.getTableRowById()` custom command
+                                    /*#__PURE__*/ jsx(SimpleTable.BodyTr, {
+                                        "data-id": 'id' in row.original ? row.original.id : row.id,
                                         children: row.getVisibleCells().map((cell)=>/*#__PURE__*/ jsx(Td$1, {
                                                 cell: cell
                                             }, cell.id))
@@ -74016,6 +74018,13 @@ function DataTable({ columns, data, initialSorting }) {
         ]
     });
 }
+const TBody = styled.tbody`
+  > tr {
+    > td {
+      border-top: ${(p)=>p.$withTopBorder ? `1px solid ${p.theme.color.lightGray}` : 0};
+    }
+  }
+`;
 
 function RowCheckbox({ onChange, ...nativeProps }) {
     const handleOnChange = useCallback((_value, _checked, event)=>{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mtes-mct/monitor-ui",
   "description": "Common React components, hooks, utilities and CSS stylesheets for MonitorFish, MonitorEnv and RapportNav.",
-  "version": "24.2.0",
+  "version": "24.3.0",
   "license": "AGPL-3.0",
   "type": "module",
   "engines": {
@@ -12,7 +12,7 @@
     "@tanstack/react-table": "8.20.5",
     "@tanstack/react-virtual": "beta",
     "prop-types": "15.8.1",
-    "tslib": "2.7.0"
+    "tslib": "2.8.0"
   },
   "peerDependencies": {
     "@sentry/react": "^7.0.0 || ^8.0.0",

package/tables/DataTable/index.d.ts

@@ -1,9 +1,11 @@
-import { type ColumnDef, type SortingState } from '@tanstack/react-table';
-import type { CollectionItem } from '../../types/definitions';
-export type DataTableProps<T extends CollectionItem> = {
+import { type ColumnDef, type SortingState, type TableOptions } from '@tanstack/react-table';
+import type { AnyObject } from '../../types/definitions';
+export type DataTableProps<T extends AnyObject> = {
     columns: Array<ColumnDef<T>>;
     data: T[] | undefined;
     initialSorting: SortingState;
+    isTableHeadHidden?: boolean | undefined;
+    tableOptions?: TableOptions<T> | undefined;
 };
-export declare function DataTable<T extends CollectionItem>({ columns, data, initialSorting }: DataTableProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function DataTable<T extends AnyObject>({ columns, data, initialSorting, isTableHeadHidden, tableOptions }: DataTableProps<T>): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=index.d.ts.map

package/tables/DataTable/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tables/DataTable/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EAIlB,MAAM,uBAAuB,CAAA;AAO9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,cAAc,IAAI;IACrD,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,IAAI,EAAE,CAAC,EAAE,GAAG,SAAS,CAAA;IACrB,cAAc,EAAE,YAAY,CAAA;CAC7B,CAAA;AACD,wBAAgB,SAAS,CAAC,CAAC,SAAS,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC,2CAqDvG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tables/DataTable/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,YAAY,EAIlB,MAAM,uBAAuB,CAAA;AAQ9B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,SAAS,IAAI;IAChD,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,IAAI,EAAE,CAAC,EAAE,GAAG,SAAS,CAAA;IACrB,cAAc,EAAE,YAAY,CAAA;IAC5B,iBAAiB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACvC,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;CAC3C,CAAA;AACD,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,EAAE,EAC7C,OAAO,EACP,IAAI,EACJ,cAAc,EACd,iBAAyB,EACzB,YAAY,EACb,EAAE,cAAc,CAAC,CAAC,CAAC,2CAyDnB"}

package/tables/SimpleTable/Td.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Td.d.ts","sourceRoot":"","sources":["../../../src/tables/SimpleTable/Td.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAM7C,eAAO,MAAM,EAAE;gBAHD,OAAO,GAAG,SAAS;iBAClB,OAAO,GAAG,SAAS;6EA0BjC,CAAA"}
+{"version":3,"file":"Td.d.ts","sourceRoot":"","sources":["../../../src/tables/SimpleTable/Td.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAM7C,eAAO,MAAM,EAAE;gBAHD,OAAO,GAAG,SAAS;iBAClB,OAAO,GAAG,SAAS;6EAyBjC,CAAA"}