@onesy/ui-react 1.0.180 → 1.0.182

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -335,9 +335,14 @@ const TimePicker = props__ => {
335
335
  const touch = (0, _useMediaQuery.default)('(pointer: coarse)', {
336
336
  element: refs.root.current
337
337
  });
338
+ const onResolveValue = valueNew => {
339
+ const array = ((0, _utils.is)('array', valueNew) ? valueNew : [valueNew]).filter(Boolean);
340
+ const sorted = array.sort((a, b) => (a === null || a === void 0 ? void 0 : a.milliseconds) - (b === null || b === void 0 ? void 0 : b.milliseconds));
341
+ return sorted;
342
+ };
338
343
  const [value, setValue] = _react.default.useState(() => {
339
344
  const valueResult = (valueDefault !== undefined ? valueDefault : value_) || now && (range ? [new _date.OnesyDate(), new _date.OnesyDate()] : [new _date.OnesyDate()]);
340
- return ((0, _utils.is)('array', valueResult) ? valueResult : [valueResult]).filter(Boolean);
345
+ return onResolveValue(valueResult);
341
346
  });
342
347
  const [selecting, setSelecting] = _react.default.useState(() => {
343
348
  const valueResult_0 = (selectingDefault !== undefined ? selectingDefault : selecting_) || ['hour', 'hour'];
@@ -353,9 +358,9 @@ const TimePicker = props__ => {
353
358
  refs.value.current = value;
354
359
  refs.mode.current = mode;
355
360
  refs.dayTime.current = dayTime;
356
- const valueToInput = (valueNew = refs.value.current) => {
361
+ const valueToInput = (valueNew_0 = refs.value.current) => {
357
362
  let result_0 = '';
358
- const [from, to] = (0, _utils.is)('array', valueNew) ? valueNew : [valueNew];
363
+ const [from, to] = (0, _utils.is)('array', valueNew_0) ? valueNew_0 : [valueNew_0];
359
364
  if (!(from || to)) return '';
360
365
  const method = item_1 => {
361
366
  let formatValue = '';
@@ -375,20 +380,20 @@ const TimePicker = props__ => {
375
380
  if (touch) version = 'mobile';else version = 'desktop';
376
381
  }
377
382
  const onUpdateValue = valueNew_ => {
378
- const valueNew_0 = (0, _utils.is)('array', valueNew_) ? valueNew_ : [valueNew_];
383
+ const valueNew_1 = onResolveValue(valueNew_);
379
384
 
380
385
  // Update value
381
- setValue(valueNew_0);
386
+ setValue(valueNew_1);
382
387
 
383
388
  // Update input
384
- setInput(valueToInput(valueNew_0));
389
+ setInput(valueToInput(valueNew_1));
385
390
 
386
391
  // Update dayTime
387
- setDayTime(valueNew_0.map(item_2 => (0, _date.format)(item_2, 'a')));
392
+ setDayTime(valueNew_1.map(item_2 => (0, _date.format)(item_2, 'a')));
388
393
  };
389
- const errorCheck = (valueNew_1 = value) => {
394
+ const errorCheck = (valueNew_2 = value) => {
390
395
  // Error
391
- setError((valueNew_1 || []).some((item_3, index) => !valid(item_3)));
396
+ setError((valueNew_2 || []).some((item_3, index) => !valid(item_3)));
392
397
  };
393
398
 
394
399
  // Init
@@ -399,22 +404,22 @@ const TimePicker = props__ => {
399
404
 
400
405
  // Value
401
406
  _react.default.useEffect(() => {
402
- if (value_ !== undefined && value_ !== value) onUpdateValue(((0, _utils.is)('array', value_) ? value_ : [value_]).filter(Boolean));
407
+ if (value_ !== undefined && value_ !== value) onUpdateValue(value_);
403
408
  }, [value_]);
404
409
  const onUpdate = valueNew__0 => {
405
- const valueNew_2 = resolve(valueNew__0);
410
+ const valueNew_3 = resolve(valueNew__0);
406
411
 
407
412
  // Inner update
408
- if (!props.hasOwnProperty('value')) setValue(valueNew_2);
409
- if ((0, _utils.is)('function', onChange)) onChange(!range ? valueNew_2[0] : valueNew_2);
413
+ if (!props.hasOwnProperty('value')) setValue(valueNew_3);
414
+ if ((0, _utils.is)('function', onChange)) onChange(!range ? valueNew_3[0] : valueNew_3);
410
415
  };
411
416
  const onUpdateSelecting = (valueNew__1, index_0) => {
412
- const valueNew_3 = [...selecting];
413
- valueNew_3[index_0] = valueNew__1;
417
+ const valueNew_4 = [...selecting];
418
+ valueNew_4[index_0] = valueNew__1;
414
419
 
415
420
  // Inner update
416
- if (!props.hasOwnProperty('selecting')) setSelecting(valueNew_3);
417
- if ((0, _utils.is)('function', onChangeSelecting)) onChangeSelecting(valueNew_3);
421
+ if (!props.hasOwnProperty('selecting')) setSelecting(valueNew_4);
422
+ if ((0, _utils.is)('function', onChangeSelecting)) onChangeSelecting(valueNew_4);
418
423
  };
419
424
  const valid = (...args) => {
420
425
  if ((0, _utils.is)('function', valid_)) return valid_(...args);
@@ -428,8 +433,8 @@ const TimePicker = props__ => {
428
433
  }
429
434
  return true;
430
435
  };
431
- const textToOnesyDate = valueNew_4 => {
432
- const [times, dayTime_] = (valueNew_4 || '').split(' ');
436
+ const textToOnesyDate = valueNew_5 => {
437
+ const [times, dayTime_] = (valueNew_5 || '').split(' ');
433
438
  const values = times.split(':');
434
439
  let valueTime;
435
440
  let onesyDate_0 = new _date.OnesyDate();
@@ -453,15 +458,15 @@ const TimePicker = props__ => {
453
458
  }
454
459
  return onesyDate_0;
455
460
  };
456
- const onInputModalChange = (valueNew_5, unit, index_1) => {
457
- let valueTime_0 = valueNew_5;
461
+ const onInputModalChange = (valueNew_6, unit, index_1) => {
462
+ let valueTime_0 = valueNew_6;
458
463
  if ((0, _utils.is)('string', valueTime_0) && valueTime_0.startsWith('0')) valueTime_0 = valueTime_0.slice(1);
459
464
  valueTime_0 = +valueTime_0;
460
465
  value[index_1] = (0, _date.set)(valueTime_0, unit || selecting[index_1], value[index_1]);
461
466
  (!actions_ ? onUpdate : setValue)(resolve(value));
462
467
  };
463
- const resolve = (valueNew_6 = refs.value.current, dayTimeNew = refs.dayTime.current) => {
464
- const values_0 = valueNew_6.filter(Boolean).map((item_4, index_2) => {
468
+ const resolve = (valueNew_7 = refs.value.current, dayTimeNew = refs.dayTime.current) => {
469
+ const values_0 = onResolveValue(valueNew_7).map((item_4, index_2) => {
465
470
  // Resolve the range value
466
471
  const valueHour = item_4.hour;
467
472
  if (format === '12') {
@@ -473,35 +478,35 @@ const TimePicker = props__ => {
473
478
  return values_0;
474
479
  };
475
480
  const updateDayTime = (valueNew__2, index_3) => {
476
- const valueNew_7 = valueNew__2[0];
481
+ const valueNew_8 = valueNew__2[0];
477
482
 
478
483
  // Update dayTime
479
484
  const dayTimeNew_0 = [...dayTime];
480
- dayTimeNew_0[index_3] = valueNew_7;
485
+ dayTimeNew_0[index_3] = valueNew_8;
481
486
  refs.dayTime.current = dayTimeNew_0;
482
487
  setDayTime(dayTimeNew_0);
483
488
  (!actions_ ? onUpdate : setValue)(resolve(refs.value.current));
484
489
  };
485
490
  const inputToValue = (valueNew__3 = input) => {
486
- let valueNew_8 = valueNew__3;
487
- let [from_0, to_0] = valueNew_8.split(_DatePicker.SEPARATOR);
491
+ let valueNew_9 = valueNew__3;
492
+ let [from_0, to_0] = valueNew_9.split(_DatePicker.SEPARATOR);
488
493
  from_0 = textToOnesyDate(from_0);
489
494
  if (to_0) to_0 = textToOnesyDate(to_0);
490
- valueNew_8 = [from_0, to_0].filter(Boolean).filter(item_5 => item_5 === null || item_5 === void 0 ? void 0 : item_5.valid);
491
- return valueNew_8;
495
+ valueNew_9 = [from_0, to_0].filter(Boolean).filter(item_5 => item_5 === null || item_5 === void 0 ? void 0 : item_5.valid);
496
+ return valueNew_9;
492
497
  };
493
498
  const onInputChange = valueNew__4 => {
494
- const valueNew_9 = inputToValue(valueNew__4);
495
- const validValues = valueNew_9.every(item_6 => item_6.valid);
499
+ const valueNew_10 = inputToValue(valueNew__4);
500
+ const validValues = valueNew_10.every(item_6 => item_6.valid);
496
501
 
497
502
  // Only update values if input is valid
498
503
  // format used to make the value
499
504
  if (validValues) {
500
505
  // Error
501
- errorCheck(valueNew_9);
506
+ errorCheck(valueNew_10);
502
507
 
503
508
  // Update value
504
- onUpdate(valueNew_9);
509
+ onUpdate(valueNew_10);
505
510
  }
506
511
  if (!valueNew__4) {
507
512
  onUpdate([null, null]);
@@ -511,21 +516,21 @@ const TimePicker = props__ => {
511
516
  setInput(valueNew__4);
512
517
  };
513
518
  const onChangeClock = (valueNew__5, index_4 = 0) => {
514
- const valueNew_10 = [...value];
519
+ const valueNew_11 = [...value];
515
520
  if (valueNew__5 !== value[index_4]) {
516
- valueNew_10[index_4] = valueNew__5;
517
- (!actions_ ? onUpdate : setValue)(resolve(valueNew_10));
521
+ valueNew_11[index_4] = valueNew__5;
522
+ (!actions_ ? onUpdate : setValue)(resolve(valueNew_11));
518
523
 
519
524
  // Error
520
- errorCheck(valueNew_10);
525
+ errorCheck(valueNew_11);
521
526
  }
522
527
  };
523
- const onChangeSelectingClock = (valueNew_11, index_5 = 0) => {
528
+ const onChangeSelectingClock = (valueNew_12, index_5 = 0) => {
524
529
  const selectingValue = selecting;
525
- selectingValue[index_5] = valueNew_11;
526
- if (valueNew_11 !== selecting[0]) setSelecting([...selectingValue]);
530
+ selectingValue[index_5] = valueNew_12;
531
+ if (valueNew_12 !== selecting[0]) setSelecting([...selectingValue]);
527
532
  };
528
- const onDoneSelecting = (valueNew_12, selectingNew) => {
533
+ const onDoneSelecting = (valueNew_13, selectingNew) => {
529
534
  // AutoCloseOnLast
530
535
  if (autoCloseOnLast && refs.mode.current === 'select') {
531
536
  if (['hour', 'minute', 'second'].includes(selectingNew)) {
@@ -548,40 +553,40 @@ const TimePicker = props__ => {
548
553
  if ((0, _utils.is)('function', onClose_)) onClose_(event);
549
554
  };
550
555
  const onReset = () => {
551
- const valueNew_13 = inputToValue();
556
+ const valueNew_14 = inputToValue();
552
557
 
553
558
  // Update value
554
- onUpdate(valueNew_13);
559
+ onUpdate(valueNew_14);
555
560
 
556
561
  // Update dayTime
557
- setDayTime(valueNew_13.map(item_7 => (0, _date.format)(item_7, 'a')));
562
+ setDayTime(valueNew_14.map(item_7 => (0, _date.format)(item_7, 'a')));
558
563
  };
559
564
  const onToday = event_0 => {
560
- const valueNew_14 = [new _date.OnesyDate()];
561
- if (range) valueNew_14.push(new _date.OnesyDate());
565
+ const valueNew_15 = [new _date.OnesyDate()];
566
+ if (range) valueNew_15.push(new _date.OnesyDate());
562
567
 
563
568
  // Update value
564
- onUpdate(valueNew_14);
569
+ onUpdate(valueNew_15);
565
570
 
566
571
  // Update input
567
- setInput(valueToInput(valueNew_14));
572
+ setInput(valueToInput(valueNew_15));
568
573
 
569
574
  // Update dayTime
570
- setDayTime(valueNew_14.map(item_8 => (0, _date.format)(item_8, 'a')));
575
+ setDayTime(valueNew_15.map(item_8 => (0, _date.format)(item_8, 'a')));
571
576
  onClose(event_0);
572
577
  if ((0, _utils.is)('function', onToday_)) onToday_(event_0);
573
578
  };
574
579
  const onClear = event_1 => {
575
- const valueNew_15 = [];
580
+ const valueNew_16 = [];
576
581
 
577
582
  // Update value
578
- onUpdate(valueNew_15);
583
+ onUpdate(valueNew_16);
579
584
 
580
585
  // Update input
581
- setInput(valueToInput(valueNew_15));
586
+ setInput(valueToInput(valueNew_16));
582
587
 
583
588
  // Update dayTime
584
- setDayTime(valueNew_15.map(item_9 => (0, _date.format)(item_9, 'a')));
589
+ setDayTime(valueNew_16.map(item_9 => (0, _date.format)(item_9, 'a')));
585
590
  onClose(event_1);
586
591
  if ((0, _utils.is)('function', onClear_)) onClear_(event_1);
587
592
  };
@@ -671,8 +676,8 @@ const TimePicker = props__ => {
671
676
  value: value[index_6] || new _date.OnesyDate(),
672
677
  dayTime: dayTime[index_6] || (0, _date.format)(new _date.OnesyDate(), 'a'),
673
678
  selecting: selecting[index_6],
674
- onChange: valueNew_16 => onChangeClock(valueNew_16, index_6),
675
- onChangeSelecting: valueNew_17 => onChangeSelectingClock(valueNew_17, index_6),
679
+ onChange: valueNew_17 => onChangeClock(valueNew_17, index_6),
680
+ onChangeSelecting: valueNew_18 => onChangeSelectingClock(valueNew_18, index_6),
676
681
  onDoneSelecting: onDoneSelecting,
677
682
  renderValue: renderValue,
678
683
  valid: valid,
@@ -739,7 +744,7 @@ const TimePicker = props__ => {
739
744
  inputs.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(AdvancedTextField, _objectSpread({
740
745
  helperText: l('Hour'),
741
746
  value: (0, _date.format)(value[index_7], format === '12' ? 'hh' : 'HH'),
742
- onChange: valueNew_18 => onInputModalChange(valueNew_18, 'hour', index_7),
747
+ onChange: valueNew_19 => onInputModalChange(valueNew_19, 'hour', index_7),
743
748
  placeholder: "00",
744
749
  mask: [...(format === '12' ? [{
745
750
  pattern: '[0-1]'
@@ -761,7 +766,7 @@ const TimePicker = props__ => {
761
766
  inputs.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(AdvancedTextField, _objectSpread({
762
767
  helperText: l('Minute'),
763
768
  value: (0, _date.format)(value[index_7], 'mm'),
764
- onChange: valueNew_19 => onInputModalChange(valueNew_19, 'minute', index_7),
769
+ onChange: valueNew_20 => onInputModalChange(valueNew_20, 'minute', index_7),
765
770
  placeholder: "00",
766
771
  mask: [{
767
772
  pattern: '[0-5]'
@@ -783,7 +788,7 @@ const TimePicker = props__ => {
783
788
  inputs.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(AdvancedTextField, _objectSpread({
784
789
  helperText: l('Second'),
785
790
  value: (0, _date.format)(value[index_7], 'ss'),
786
- onChange: valueNew_20 => onInputModalChange(valueNew_20, 'second', index_7),
791
+ onChange: valueNew_21 => onInputModalChange(valueNew_21, 'second', index_7),
787
792
  placeholder: "00",
788
793
  mask: [{
789
794
  pattern: '[0-5]'
@@ -828,7 +833,7 @@ const TimePicker = props__ => {
828
833
  size: size,
829
834
  orientation: orientationValue,
830
835
  value: dayTime[index_8] || (0, _date.format)(new _date.OnesyDate(), 'a'),
831
- onChange: valueNew_21 => updateDayTime(valueNew_21, index_8),
836
+ onChange: valueNew_22 => updateDayTime(valueNew_22, index_8),
832
837
  select: "single",
833
838
  unselect: false
834
839
  }, ToggleButtonsProps), {}, {
package/Watch/Watch.d.ts CHANGED
@@ -17,6 +17,7 @@ export declare type IWatch = Omit<ISurface, 'version'> & {
17
17
  RegularProps?: IPropsAny;
18
18
  MinimalProps?: IPropsAny;
19
19
  ModernProps?: IPropsAny;
20
+ RoundMeterProps?: IPropsAny;
20
21
  };
21
22
  declare const Watch: React.FC<IWatch>;
22
23
  export default Watch;
package/Watch/Watch.js CHANGED
@@ -18,7 +18,7 @@ var _RoundMeter = _interopRequireDefault(require("../RoundMeter"));
18
18
  var _Line = _interopRequireDefault(require("../Line"));
19
19
  var _utils2 = require("../utils");
20
20
  var _jsxRuntime = require("react/jsx-runtime");
21
- const _excluded = ["tonal", "color", "version", "size", "start", "timeVisible", "timeOfDayVisible", "dateVisible", "timeFormatString", "dateFormatString", "renderTime", "renderDate", "shadow", "AnalogProps", "RegularProps", "MinimalProps", "ModernProps", "Component", "className", "children"];
21
+ const _excluded = ["tonal", "color", "version", "size", "start", "timeVisible", "timeOfDayVisible", "dateVisible", "timeFormatString", "dateFormatString", "renderTime", "renderDate", "shadow", "AnalogProps", "RegularProps", "MinimalProps", "ModernProps", "RoundMeterProps", "Component", "className", "children"];
22
22
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
23
23
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
24
24
  const useStyle = (0, _styleReact.style)(theme => ({
@@ -74,6 +74,16 @@ const useStyle = (0, _styleReact.style)(theme => ({
74
74
  version_modern: {
75
75
  background: 'transparent'
76
76
  },
77
+ roundMeter: {
78
+ '&.onesy-RoundMeter-root': {
79
+ marginInline: 'auto',
80
+ '& .onesy-RoundMeter-svg': {
81
+ aspectRatio: '1 / 1',
82
+ maxWidth: '100%',
83
+ maxHeight: '100%'
84
+ }
85
+ }
86
+ },
77
87
  shadow_version_modern: {
78
88
  '& svg:first-of-type': {
79
89
  filter: `drop-shadow(0px 6px 10px rgb(0 0 0 / 4%)) drop-shadow(0px 1px 18px rgb(0 0 0 / 1%)) drop-shadow(0px 3px 5px rgb(0 0 0 / 7%))`
@@ -82,8 +92,9 @@ const useStyle = (0, _styleReact.style)(theme => ({
82
92
  modern_background: {
83
93
  position: 'absolute',
84
94
  inset: '0',
85
- width: '100%',
86
- height: 'auto'
95
+ aspectRatio: '1 / 1',
96
+ maxWidth: '100%',
97
+ maxHeight: '100%'
87
98
  },
88
99
  modernDate: {
89
100
  textAnchor: 'middle'
@@ -120,6 +131,7 @@ const Watch = props_ => {
120
131
  RegularProps,
121
132
  MinimalProps,
122
133
  ModernProps,
134
+ RoundMeterProps,
123
135
  Component = 'div',
124
136
  className,
125
137
  children
@@ -261,14 +273,15 @@ const Watch = props_ => {
261
273
  l
262
274
  })
263
275
  }))]
264
- })), version === 'analog' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(RoundMeter, _objectSpread(_objectSpread({
276
+ })), version === 'analog' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(RoundMeter, _objectSpread(_objectSpread(_objectSpread({
265
277
  tonal: tonal,
266
278
  color: color,
267
279
  size: size,
268
280
  marks: marks.analog,
269
281
  labels: labels.analog,
270
282
  background: true
271
- }, AnalogProps), {}, {
283
+ }, RoundMeterProps), AnalogProps), {}, {
284
+ className: (0, _styleReact.classNames)([RoundMeterProps === null || RoundMeterProps === void 0 ? void 0 : RoundMeterProps.className, AnalogProps === null || AnalogProps === void 0 ? void 0 : AnalogProps.className, classes.roundMeter]),
272
285
  children: [timeOfDayVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)("text", {
273
286
  x: 120,
274
287
  y: 74,
@@ -321,7 +334,7 @@ const Watch = props_ => {
321
334
  strokeWidth: 1
322
335
  }
323
336
  })]
324
- })), version === 'minimal' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(RoundMeter, _objectSpread(_objectSpread({
337
+ })), version === 'minimal' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(RoundMeter, _objectSpread(_objectSpread(_objectSpread({
325
338
  tonal: tonal,
326
339
  color: color,
327
340
  size: size,
@@ -334,7 +347,8 @@ const Watch = props_ => {
334
347
  }
335
348
  },
336
349
  background: true
337
- }, MinimalProps), {}, {
350
+ }, RoundMeterProps), MinimalProps), {}, {
351
+ className: (0, _styleReact.classNames)([RoundMeterProps === null || RoundMeterProps === void 0 ? void 0 : RoundMeterProps.className, MinimalProps === null || MinimalProps === void 0 ? void 0 : MinimalProps.className, classes.roundMeter]),
338
352
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Path, {
339
353
  d: `M 120 114 L 170 114 A 1 1 0 0 1 170 126 L 120 126 A 1 1 0 0 1 120 114`,
340
354
  value: 100 / 12 * value.hour,
@@ -369,7 +383,7 @@ const Watch = props_ => {
369
383
  fill: theme.methods.palette.color.value(undefined, 10, true, palette)
370
384
  }
371
385
  })]
372
- })), version === 'modern' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(RoundMeter, _objectSpread(_objectSpread({
386
+ })), version === 'modern' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(RoundMeter, _objectSpread(_objectSpread(_objectSpread({
373
387
  tonal: tonal,
374
388
  color: color,
375
389
  size: size,
@@ -383,7 +397,8 @@ const Watch = props_ => {
383
397
  d: "M109.976 2.90439C116.096 -0.528799 123.562 -0.528799 129.683 2.90439L143.879 10.8678C146.815 12.5147 150.117 13.3994 153.483 13.4411L169.759 13.6427C176.776 13.7296 183.241 17.4627 186.825 23.496L195.138 37.4906C196.857 40.3849 199.274 42.802 202.168 44.5212L216.163 52.8337C222.196 56.4175 225.929 62.8832 226.016 69.9001L226.218 86.1761C226.26 89.5422 227.144 92.8441 228.791 95.78L236.755 109.976C240.188 116.096 240.188 123.563 236.755 129.683L228.791 143.879C227.144 146.815 226.26 150.117 226.218 153.483L226.016 169.759C225.929 176.776 222.196 183.242 216.163 186.825L202.168 195.138C199.274 196.857 196.857 199.274 195.138 202.168L186.825 216.163C183.241 222.196 176.776 225.929 169.759 226.016L153.483 226.218C150.117 226.26 146.815 227.144 143.879 228.791L129.683 236.755C123.562 240.188 116.096 240.188 109.976 236.755L95.7799 228.791C92.844 227.144 89.5421 226.26 86.1761 226.218L69.9001 226.016C62.8832 225.929 56.4174 222.196 52.8337 216.163L44.5211 202.168C42.802 199.274 40.3848 196.857 37.4906 195.138L23.496 186.825C17.4626 183.242 13.7296 176.776 13.6427 169.759L13.4411 153.483C13.3994 150.117 12.5147 146.815 10.8678 143.879L2.90436 129.683C-0.52883 123.563 -0.528829 116.096 2.90436 109.976L10.8678 95.78C12.5147 92.8441 13.3994 89.5422 13.4411 86.1761L13.6427 69.9001C13.7296 62.8832 17.4626 56.4175 23.496 52.8337L37.4906 44.5212C40.3848 42.802 42.802 40.3849 44.5211 37.4906L52.8337 23.496C56.4174 17.4627 62.8832 13.7296 69.9001 13.6427L86.1761 13.4411C89.5421 13.3994 92.844 12.5147 95.78 10.8678L109.976 2.90439Z"
384
398
  })
385
399
  })
386
- }, ModernProps), {}, {
400
+ }, RoundMeterProps), ModernProps), {}, {
401
+ className: (0, _styleReact.classNames)([RoundMeterProps === null || RoundMeterProps === void 0 ? void 0 : RoundMeterProps.className, ModernProps === null || ModernProps === void 0 ? void 0 : ModernProps.className, classes.roundMeter]),
387
402
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Path, {
388
403
  Component: "g",
389
404
  value: 100 / 60 * value.second,
@@ -348,7 +348,8 @@ const Calendar = props__ => {
348
348
  l
349
349
  })]
350
350
  }), /*#__PURE__*/_jsx(CalendarMonth, _objectSpread(_objectSpread({
351
- color: "default",
351
+ color: color,
352
+ tonal: tonal,
352
353
  value: value,
353
354
  calendar: calendarOnesyDate_0,
354
355
  valid: valid,
@@ -409,7 +410,8 @@ const Calendar = props__ => {
409
410
  l
410
411
  })
411
412
  }), /*#__PURE__*/_jsx(CalendarMonth, _objectSpread(_objectSpread({
412
- color: "default",
413
+ color: color,
414
+ tonal: tonal,
413
415
  value: value,
414
416
  calendar: calendarOnesyDate,
415
417
  valid: valid,
@@ -577,7 +577,7 @@ const CalendarMonth = props__ => {
577
577
  // between
578
578
  day_3.is.between && !day_3.is.same && [!day_3.is.end && day_3.dayWeek !== 0 && !day_3.is.monthEnd && classes.dayStartSelection, !day_3.is.start && day_3.dayWeek !== 1 && !day_3.is.monthStart && classes.dayEndSelection]]),
579
579
  style: {
580
- '--onesy-color': day_3.is.fromSelected ? colorSelectedTheme?.main : palette?.main
580
+ '--onesy-color': theme.methods.palette.color.alpha(day_3.is.fromSelected ? colorSelectedTheme?.main : palette?.main, 1)
581
581
  },
582
582
  children: is('function', renderDay) ? renderDay(day_3.onesyDate, propsDay, day_3, outside) : /*#__PURE__*/_jsx(PaginationItem, _objectSpread(_objectSpread(_objectSpread({
583
583
  tonal: tonal,