@majoo-ui/react 2.4.0 → 2.4.2

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.
@@ -214,6 +214,9 @@ const CalendarRangePicker = _a => {
214
214
  onReset: isMultiDatePicker ? resetHandler : undefined,
215
215
  maxRange: maxRange,
216
216
  overMaxRange: overMaxRange,
217
+ showTimePicker: showTimePicker,
218
+ timePickerProps: timePickerProps,
219
+ onSetDateValue: setDateValue,
217
220
  locale: locale,
218
221
  localeText: localeText
219
222
  }, dayzedData)) : jsx(Calendar, Object.assign({
@@ -1,4 +1,4 @@
1
- import { jsxs, jsx } from 'react/jsx-runtime';
1
+ import { jsx, jsxs } from 'react/jsx-runtime';
2
2
  import React__default from 'react';
3
3
  import moment from 'moment';
4
4
  import Flex from '../../../layout/flex/Flex.esm.js';
@@ -14,7 +14,8 @@ const CalendarTimePicker = ({
14
14
  onSetDateValue,
15
15
  isSingle,
16
16
  timePickerProps,
17
- text
17
+ text,
18
+ inline
18
19
  }) => {
19
20
  let startTime = moment('00:00', 'HH:mm').toDate();
20
21
  let endTime = moment('00:00', 'HH:mm').toDate();
@@ -27,6 +28,58 @@ const CalendarTimePicker = ({
27
28
  }
28
29
  const formattedStartDate = selected && selected.length > 0 && !disabled ? toDateFormat(selected[0], language) : '-';
29
30
  const formattedEndDate = selected && selected.length > 1 && !disabled ? toDateFormat(selected[1], language) : '-';
31
+ const startTimeInput = jsx(InputTimePicker, Object.assign({
32
+ onChange: val => {
33
+ if (isSingle && selected && selected.length && !!onSetDateValue) onSetDateValue(val.toDate());else if (selected && selected.length > 1 && !!onSetDateValue) onSetDateValue([val.toDate(), selected[1]]);
34
+ },
35
+ size: "sm",
36
+ value: startTime,
37
+ disabled: isSingle ? !(selected && selected.length) : !(selected && selected.length > 1)
38
+ }, timePickerProps));
39
+ const endTimeInput = jsx(InputTimePicker, {
40
+ onChange: val => {
41
+ const endDate = moment(endTime).format('YYYY-MM-DD');
42
+ const newTime = val.format('HH:mm');
43
+ const newValue = moment(`${endDate} ${newTime}`, 'YYYY-MM-DD HH:mm').toDate();
44
+ if (selected && selected.length > 1 && !!onSetDateValue) onSetDateValue([selected[0], newValue]);
45
+ },
46
+ size: "sm",
47
+ value: endTime,
48
+ disabled: !(selected && selected.length > 1)
49
+ });
50
+ if (inline) {
51
+ return jsxs(Flex, {
52
+ gap: 4,
53
+ css: {
54
+ width: '100%'
55
+ },
56
+ children: [jsxs(Flex, {
57
+ direction: "column",
58
+ gap: 3,
59
+ css: {
60
+ flex: 1,
61
+ minWidth: 0
62
+ },
63
+ children: [jsx(Text, {
64
+ variant: "label",
65
+ color: "primary",
66
+ children: text.timeFromLabel
67
+ }), startTimeInput]
68
+ }), jsxs(Flex, {
69
+ direction: "column",
70
+ gap: 3,
71
+ css: {
72
+ flex: 1,
73
+ minWidth: 0
74
+ },
75
+ children: [jsx(Text, {
76
+ variant: "label",
77
+ color: "primary",
78
+ children: text.timeUntilLabel
79
+ }), endTimeInput]
80
+ })]
81
+ });
82
+ }
30
83
  return jsxs(Flex, {
31
84
  direction: "column",
32
85
  gap: 4,
@@ -52,14 +105,7 @@ const CalendarTimePicker = ({
52
105
  variant: "label",
53
106
  color: "primary",
54
107
  children: isSingle ? text.timeLabel : text.timeFromLabel
55
- }), jsx(InputTimePicker, Object.assign({
56
- onChange: val => {
57
- if (isSingle && selected && selected.length && !!onSetDateValue) onSetDateValue(val.toDate());else if (selected && selected.length > 1 && !!onSetDateValue) onSetDateValue([val.toDate(), selected[1]]);
58
- },
59
- size: "sm",
60
- value: startTime,
61
- disabled: isSingle ? !(selected && selected.length) : !(selected && selected.length > 1)
62
- }, timePickerProps))]
108
+ }), startTimeInput]
63
109
  }), isSingle ? null : jsxs(React__default.Fragment, {
64
110
  children: [jsx(Separator, {
65
111
  orientation: "horizontal"
@@ -82,17 +128,7 @@ const CalendarTimePicker = ({
82
128
  variant: "label",
83
129
  color: "primary",
84
130
  children: text.timeUntilLabel
85
- }), jsx(InputTimePicker, {
86
- onChange: val => {
87
- const endDate = moment(endTime).format('YYYY-MM-DD');
88
- const newTime = val.format('HH:mm');
89
- const newValue = moment(`${endDate} ${newTime}`, 'YYYY-MM-DD HH:mm').toDate();
90
- if (selected && selected.length > 1 && !!onSetDateValue) onSetDateValue([selected[0], newValue]);
91
- },
92
- size: "sm",
93
- value: endTime,
94
- disabled: !(selected && selected.length > 1)
95
- })]
131
+ }), endTimeInput]
96
132
  })]
97
133
  })]
98
134
  });
@@ -16,6 +16,7 @@ import { Separator } from '../../separator/Separator.esm.js';
16
16
  import Text from '../../text/Text.esm.js';
17
17
  import { DATE_PICKER, MONTH_PICKER, YEAR_PICKER, YEAR_RANGE_PICKER } from './Calendar.esm.js';
18
18
  import DateNumber from './DateNumber.esm.js';
19
+ import CalendarTimePicker from './CalendarTimePicker.esm.js';
19
20
  import { useLocale } from '../../../config/locale/LocaleContext.esm.js';
20
21
  import { useDatePickerLocaleText } from '../locale.esm.js';
21
22
 
@@ -111,7 +112,15 @@ const CalendarsContainer = styled(Box, {
111
112
  });
112
113
  const CalendarItemContainer = styled(Flex, {
113
114
  height: '100%',
114
- paddingBottom: '160px'
115
+ paddingBottom: '160px',
116
+ variants: {
117
+ // Keeps the last calendar row clear of the taller footer.
118
+ withTimePicker: {
119
+ true: {
120
+ paddingBottom: '244px'
121
+ }
122
+ }
123
+ }
115
124
  });
116
125
  const DateContainer = styled(Box, {
117
126
  width: '100%',
@@ -207,6 +216,9 @@ const MobileCalendar = ({
207
216
  allowReset,
208
217
  maxRange = 0,
209
218
  overMaxRange = false,
219
+ showTimePicker,
220
+ timePickerProps,
221
+ onSetDateValue,
210
222
  locale,
211
223
  localeText
212
224
  }) => {
@@ -463,6 +475,14 @@ const MobileCalendar = ({
463
475
  children: overMaxRange ? text.maxRangeExceeded({
464
476
  maxRange
465
477
  }) : selected && selected.length > 1 && !disabled ? `${toDateFormat(selected[0], language)} - ${toDateFormat(selected[1], language)}` : text.emptySelection
478
+ }), showTimePicker && jsx(CalendarTimePicker, {
479
+ selected,
480
+ disabled,
481
+ language,
482
+ onSetDateValue,
483
+ timePickerProps,
484
+ text,
485
+ inline: true
466
486
  }), jsxs(Flex, {
467
487
  gap: 3,
468
488
  children: [allowReset ? jsx(Button, {
@@ -499,6 +519,7 @@ const MobileCalendar = ({
499
519
  children: jsx(CalendarItemContainer, {
500
520
  direction: "column",
501
521
  gap: 5,
522
+ withTimePicker: multiDatePicker && !!showTimePicker,
502
523
  children: calendars.map((calendar, index) => jsxs(DateContainer, {
503
524
  children: [renderHeader(index), jsx(Separator, {
504
525
  css: {
@@ -1,5 +1,10 @@
1
1
  import { useLocaleText } from '../../../../config/locale/useLocaleText.esm.js';
2
2
 
3
+ const defaultInputCreatableLocaleText = {
4
+ addOptionLabel: ({
5
+ value
6
+ }) => `Tambah "${value}"`
7
+ };
3
8
  const i18nInputCreatableLocaleText = t => ({
4
9
  addOptionLabel: ({
5
10
  value
@@ -12,4 +17,4 @@ const i18nInputCreatableLocaleText = t => ({
12
17
  */
13
18
  const useInputCreatableLocaleText = localeText => useLocaleText('inputCreatable', ['MajooUI/inputCreatable', 'translation'], i18nInputCreatableLocaleText, localeText);
14
19
 
15
- export { useInputCreatableLocaleText };
20
+ export { defaultInputCreatableLocaleText, useInputCreatableLocaleText };
package/index.esm.css CHANGED
@@ -1,3 +1,7 @@
1
+ .recharts-pie-sector {
2
+ outline: none;
3
+ }
4
+
1
5
  .rdw-option-wrapper {
2
6
  padding: 5px;
3
7
  min-width: 25px;
@@ -1289,7 +1293,3 @@
1289
1293
  height: 24px;
1290
1294
  }
1291
1295
  }
1292
-
1293
- .recharts-pie-sector {
1294
- outline: none;
1295
- }
package/index.esm.js CHANGED
@@ -24,8 +24,10 @@ export { defaultInputSearchboxLocaleText } from './components/form/components/In
24
24
  export { IconContainer, Input, InputSelect, OptionWrapper, SelectBox, SelectContainer, SelectItem, SelectOption } from './components/form/components/InputSelect/InputSelect.esm.js';
25
25
  export { defaultInputSelectLocaleText } from './components/form/components/InputSelect/locale.esm.js';
26
26
  export { default as InputSelectCheck } from './components/form/components/InputSelectCheck/InputSelectCheck.esm.js';
27
+ export { defaultInputSelectCheckLocaleText } from './components/form/components/InputSelectCheck/locale.esm.js';
27
28
  export { default as InputSelectTag } from './components/form/components/InputSelectTag/InputSelectTag.esm.js';
28
29
  export { InputCreatable } from './components/form/components/InputCreatable/InputCreatable.esm.js';
30
+ export { defaultInputCreatableLocaleText } from './components/form/components/InputCreatable/locale.esm.js';
29
31
  export { default as InputResourceList } from './components/form/components/InputResourceList/InputResourceList.esm.js';
30
32
  export { defaultInputResourceListLocaleText } from './components/form/components/InputResourceList/locale.esm.js';
31
33
  export { InputCombobox } from './components/form/components/InputCombobox/InputCombobox.esm.js';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@majoo-ui/react",
3
- "version": "2.4.0",
3
+ "version": "2.4.2",
4
4
  "main": "./index.esm.js",
5
5
  "sideEffects": [
6
6
  "*.css",
@@ -9,6 +9,8 @@ interface CalendarProps {
9
9
  timePickerProps?: object;
10
10
  /** Texts already resolved by the calendar. */
11
11
  text: DatePickerLocaleText;
12
+ /** Only the two range time inputs, side by side — for the mobile footer, which already shows the dates. */
13
+ inline?: boolean;
12
14
  }
13
- declare const CalendarTimePicker: ({ selected, disabled, language, onSetDateValue, isSingle, timePickerProps, text }: CalendarProps) => JSX.Element;
15
+ declare const CalendarTimePicker: ({ selected, disabled, language, onSetDateValue, isSingle, timePickerProps, text, inline, }: CalendarProps) => JSX.Element;
14
16
  export default CalendarTimePicker;
@@ -1,4 +1,4 @@
1
1
  /// <reference types="react" />
2
2
  import { CalendarProps } from './Calendar';
3
- declare const MobileCalendar: ({ calendars, getDateProps, advanceView, onCalendarDateChange, onIsMultiDateChange, onUpdate, onCancel, onReset, selected, containerStyle, disabled, minDate, maxDate, allowReset, maxRange, overMaxRange, locale, localeText, }: CalendarProps) => JSX.Element | null;
3
+ declare const MobileCalendar: ({ calendars, getDateProps, advanceView, onCalendarDateChange, onIsMultiDateChange, onUpdate, onCancel, onReset, selected, containerStyle, disabled, minDate, maxDate, allowReset, maxRange, overMaxRange, showTimePicker, timePickerProps, onSetDateValue, locale, localeText, }: CalendarProps) => JSX.Element | null;
4
4
  export default MobileCalendar;
@@ -19,8 +19,12 @@ export { defaultInputSearchboxLocaleText } from './InputSearchbox/locale';
19
19
  export { default as InputSelect } from './InputSelect/InputSelect';
20
20
  export * from './InputSelect';
21
21
  export { default as InputSelectCheck } from './InputSelectCheck/InputSelectCheck';
22
+ export type { InputSelectCheckLocaleText } from './InputSelectCheck/locale';
23
+ export { defaultInputSelectCheckLocaleText } from './InputSelectCheck/locale';
22
24
  export { default as InputSelectTag } from './InputSelectTag/InputSelectTag';
23
25
  export { default as InputCreatable } from './InputCreatable/InputCreatable';
26
+ export type { InputCreatableLocaleText } from './InputCreatable/locale';
27
+ export { defaultInputCreatableLocaleText } from './InputCreatable/locale';
24
28
  export { default as InputResourceList } from './InputResourceList/InputResourceList';
25
29
  export type { InputResourceListLocaleText } from './InputResourceList/locale';
26
30
  export { defaultInputResourceListLocaleText } from './InputResourceList/locale';