@steroidsjs/bootstrap 3.0.37 → 3.0.39
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.
- package/content/Calendar/CalendarView.js +10 -9
- package/form/DateRangeField/DateRangeFieldView.scss +5 -4
- package/form/DateRangeField/views/RangeButtons/RangeButtons.scss +24 -23
- package/form/DateTimeRangeField/DateTimeRangeFieldView.scss +4 -4
- package/form/InputField/InputFieldView.scss +12 -10
- package/package.json +2 -2
|
@@ -48,13 +48,20 @@ function CalendarView(props) {
|
|
|
48
48
|
var localeComponent = (0, hooks_1.useComponents)().locale;
|
|
49
49
|
//TODO Исправить тип, связано с yarn tsc в action publish.yml
|
|
50
50
|
var DayPicker = react_day_picker_1["default"];
|
|
51
|
-
var month = props.month, toYear = props.toYear, fromYear = props.fromYear, showFooter = props.showFooter, showTodayButton = props.showTodayButton, onDaySelect = props.onDaySelect, selectedDates = props.selectedDates, onMonthSelect = props.onMonthSelect, numberOfMonths = props.numberOfMonths, toggleCaptionPanel = props.toggleCaptionPanel, isCaptionPanelVisible = props.isCaptionPanelVisible;
|
|
51
|
+
var month = props.month, toYear = props.toYear, fromYear = props.fromYear, showFooter = props.showFooter, showTodayButton = props.showTodayButton, onDaySelect = props.onDaySelect, selectedDates = props.selectedDates, onMonthSelect = props.onMonthSelect, numberOfMonths = props.numberOfMonths, toggleCaptionPanel = props.toggleCaptionPanel, isCaptionPanelVisible = props.isCaptionPanelVisible, todayDate = props.todayDate;
|
|
52
52
|
var isRange = !!selectedDates[0] && !!selectedDates[1];
|
|
53
53
|
var _a = (0, react_1.useMemo)(function () {
|
|
54
54
|
var from = selectedDates[0];
|
|
55
55
|
var to = selectedDates[1];
|
|
56
56
|
var inRange = function (day) { return react_day_picker_1.DateUtils.isDayAfter(day, from) && react_day_picker_1.DateUtils.isDayBefore(day, to); };
|
|
57
57
|
var outRange = function (day) { return react_day_picker_1.DateUtils.isDayBefore(day, from); };
|
|
58
|
+
var rangeModifiers = isRange && !react_day_picker_1.DateUtils.isSameDay(from, to)
|
|
59
|
+
? {
|
|
60
|
+
start: from,
|
|
61
|
+
end: to,
|
|
62
|
+
inRange: inRange
|
|
63
|
+
}
|
|
64
|
+
: undefined;
|
|
58
65
|
return {
|
|
59
66
|
selectedDays: isRange
|
|
60
67
|
? [from, {
|
|
@@ -62,15 +69,9 @@ function CalendarView(props) {
|
|
|
62
69
|
to: to
|
|
63
70
|
}]
|
|
64
71
|
: from,
|
|
65
|
-
modifiers:
|
|
66
|
-
? {
|
|
67
|
-
start: from,
|
|
68
|
-
end: to,
|
|
69
|
-
inRange: inRange
|
|
70
|
-
}
|
|
71
|
-
: undefined
|
|
72
|
+
modifiers: __assign(__assign({}, (rangeModifiers || {})), { today: function (day) { return react_day_picker_1.DateUtils.isSameDay(day, todayDate); } })
|
|
72
73
|
};
|
|
73
|
-
}, [isRange, selectedDates]), selectedDays = _a.selectedDays, modifiers = _a.modifiers;
|
|
74
|
+
}, [isRange, selectedDates, todayDate]), selectedDays = _a.selectedDays, modifiers = _a.modifiers;
|
|
74
75
|
var shouldShowFooter = (0, react_1.useMemo)(function () { return (
|
|
75
76
|
// Показывать кнопку "закрыть", если открыто меню с выбором месяца, независимо от showTodayButton
|
|
76
77
|
(showFooter && isCaptionPanelVisible)
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
@use "sass:map";
|
|
1
2
|
@use "../../scss/variables";
|
|
2
3
|
@use '../../scss/mixins';
|
|
3
4
|
@forward './views/RangeButtons/RangeButtons.scss';
|
|
@@ -75,11 +76,11 @@ $all-directions: top, bottom, left, right;
|
|
|
75
76
|
&_position {
|
|
76
77
|
@each $pos, $config in $positions {
|
|
77
78
|
&_#{$pos} {
|
|
78
|
-
flex-direction: map
|
|
79
|
+
flex-direction: map.get($config, direction);
|
|
79
80
|
align-items: center;
|
|
80
81
|
|
|
81
82
|
@media (max-width: variables.$tablet-width) {
|
|
82
|
-
flex-direction: map
|
|
83
|
+
flex-direction: map.get($config, responsive);
|
|
83
84
|
align-items: center;
|
|
84
85
|
}
|
|
85
86
|
}
|
|
@@ -88,11 +89,11 @@ $all-directions: top, bottom, left, right;
|
|
|
88
89
|
@each $dir2 in $all-directions {
|
|
89
90
|
@if $dir1 != $dir2 {
|
|
90
91
|
&_#{$dir1}-#{$dir2} {
|
|
91
|
-
flex-direction: map
|
|
92
|
+
flex-direction: map.get(map.get($positions, $dir1), direction);
|
|
92
93
|
align-items: center;
|
|
93
94
|
|
|
94
95
|
@media (max-width: variables.$tablet-width) {
|
|
95
|
-
flex-direction: map
|
|
96
|
+
flex-direction: map.get(map.get($positions, $dir2), direction);
|
|
96
97
|
align-items: center;
|
|
97
98
|
}
|
|
98
99
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
@use "sass:map";
|
|
1
2
|
@use '../../../../scss/variables';
|
|
2
3
|
|
|
3
4
|
$all-directions: top, bottom, left, right;
|
|
@@ -56,18 +57,18 @@ $positions: (
|
|
|
56
57
|
&_position {
|
|
57
58
|
@each $dir, $config in $positions {
|
|
58
59
|
&_#{$dir} {
|
|
59
|
-
flex-direction: map
|
|
60
|
-
justify-content: map
|
|
61
|
-
|
|
62
|
-
@each $pad, $val in map
|
|
60
|
+
flex-direction: map.get($config, flex-direction);
|
|
61
|
+
justify-content: map.get($config, justify-content);
|
|
62
|
+
|
|
63
|
+
@each $pad, $val in map.get($config, padding) {
|
|
63
64
|
#{$pad}: #{$val};
|
|
64
65
|
}
|
|
65
|
-
|
|
66
|
+
|
|
66
67
|
&::before {
|
|
67
|
-
@each $prop, $val in map
|
|
68
|
+
@each $prop, $val in map.get($config, before) {
|
|
68
69
|
#{$prop}: #{$val};
|
|
69
70
|
}
|
|
70
|
-
@each $size, $val in map
|
|
71
|
+
@each $size, $val in map.get($config, size) {
|
|
71
72
|
#{$size}: #{$val};
|
|
72
73
|
}
|
|
73
74
|
}
|
|
@@ -77,39 +78,39 @@ $positions: (
|
|
|
77
78
|
@each $dir2 in $all-directions {
|
|
78
79
|
@if $dir1 != $dir2 {
|
|
79
80
|
&_#{$dir1}-#{$dir2} {
|
|
80
|
-
flex-direction: map
|
|
81
|
-
justify-content: map
|
|
82
|
-
|
|
81
|
+
flex-direction: map.get(map.get($positions, $dir1), flex-direction);
|
|
82
|
+
justify-content: map.get(map.get($positions, $dir1), justify-content);
|
|
83
|
+
|
|
83
84
|
// padding из первого направления
|
|
84
|
-
@each $pad, $val in map
|
|
85
|
+
@each $pad, $val in map.get(map.get($positions, $dir1), padding) {
|
|
85
86
|
#{$pad}: #{$val};
|
|
86
87
|
}
|
|
87
|
-
|
|
88
|
+
|
|
88
89
|
&::before {
|
|
89
90
|
// before из первого направления
|
|
90
|
-
@each $prop, $val in map
|
|
91
|
+
@each $prop, $val in map.get(map.get($positions, $dir1), before) {
|
|
91
92
|
#{$prop}: #{$val};
|
|
92
93
|
}
|
|
93
94
|
// size из первого направления
|
|
94
|
-
@each $size, $val in map
|
|
95
|
+
@each $size, $val in map.get(map.get($positions, $dir1), size) {
|
|
95
96
|
#{$size}: #{$val};
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
|
-
|
|
99
|
+
|
|
99
100
|
@media (max-width: variables.$tablet-width) {
|
|
100
101
|
// при адаптиве — использовать второй как fallback
|
|
101
|
-
flex-direction: map
|
|
102
|
-
justify-content: map
|
|
103
|
-
|
|
104
|
-
@each $pad, $val in map
|
|
102
|
+
flex-direction: map.get(map.get($positions, $dir2), flex-direction);
|
|
103
|
+
justify-content: map.get(map.get($positions, $dir2), justify-content);
|
|
104
|
+
|
|
105
|
+
@each $pad, $val in map.get(map.get($positions, $dir2), padding) {
|
|
105
106
|
#{$pad}: #{$val};
|
|
106
107
|
}
|
|
107
|
-
|
|
108
|
+
|
|
108
109
|
&::before {
|
|
109
|
-
@each $prop, $val in map
|
|
110
|
+
@each $prop, $val in map.get(map.get($positions, $dir2), before) {
|
|
110
111
|
#{$prop}: #{$val};
|
|
111
112
|
}
|
|
112
|
-
@each $size, $val in map
|
|
113
|
+
@each $size, $val in map.get(map.get($positions, $dir2), size) {
|
|
113
114
|
#{$size}: #{$val};
|
|
114
115
|
}
|
|
115
116
|
}
|
|
@@ -123,4 +124,4 @@ $positions: (
|
|
|
123
124
|
.ButtonView__text {
|
|
124
125
|
text-wrap: nowrap;
|
|
125
126
|
}
|
|
126
|
-
}
|
|
127
|
+
}
|
|
@@ -72,11 +72,11 @@ $all-directions: top, bottom, left, right;
|
|
|
72
72
|
&_position {
|
|
73
73
|
@each $pos, $config in $positions {
|
|
74
74
|
&_#{$pos} {
|
|
75
|
-
flex-direction: map
|
|
75
|
+
flex-direction: map.get($config, direction);
|
|
76
76
|
align-items: center;
|
|
77
77
|
|
|
78
78
|
@media (max-width: variables.$tablet-width) {
|
|
79
|
-
flex-direction: map
|
|
79
|
+
flex-direction: map.get($config, responsive);
|
|
80
80
|
align-items: center;
|
|
81
81
|
}
|
|
82
82
|
}
|
|
@@ -85,11 +85,11 @@ $all-directions: top, bottom, left, right;
|
|
|
85
85
|
@each $dir2 in $all-directions {
|
|
86
86
|
@if $dir1 != $dir2 {
|
|
87
87
|
&_#{$dir1}-#{$dir2} {
|
|
88
|
-
flex-direction: map
|
|
88
|
+
flex-direction: map.get(map.get($positions, $dir1), direction);
|
|
89
89
|
align-items: center;
|
|
90
90
|
|
|
91
91
|
@media (max-width: variables.$tablet-width) {
|
|
92
|
-
flex-direction: map
|
|
92
|
+
flex-direction: map.get(map.get($positions, $dir2), direction);
|
|
93
93
|
align-items: center;
|
|
94
94
|
}
|
|
95
95
|
}
|
|
@@ -44,7 +44,7 @@ $lead-icon-disabled-color: var(--lead-icon-disabled-color);
|
|
|
44
44
|
--addon-padding: 5px 8px;
|
|
45
45
|
|
|
46
46
|
--input-font-size: #{variables.$font-size-sm};
|
|
47
|
-
|
|
47
|
+
|
|
48
48
|
//Sizes
|
|
49
49
|
&_size {
|
|
50
50
|
&_lg {
|
|
@@ -215,16 +215,18 @@ $lead-icon-disabled-color: var(--lead-icon-disabled-color);
|
|
|
215
215
|
color: variables.$text-color;
|
|
216
216
|
}
|
|
217
217
|
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
218
|
+
& {
|
|
219
|
+
// BORDERS
|
|
220
|
+
--input-border-radius: #{variables.$radius-small};
|
|
221
|
+
--input-border-width: 1px;
|
|
222
|
+
--input-border-color: #{variables.$element-border-color};
|
|
223
|
+
--input-left-border-radius: var(--input-border-radius);
|
|
224
|
+
--input-right-border-radius: var(--input-border-radius);
|
|
224
225
|
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
226
|
+
--input-wrapper-border-width: 1px;
|
|
227
|
+
--input-wrapper-border-color: transparent;
|
|
228
|
+
--input-wrapper-border-opacity: 0;
|
|
229
|
+
}
|
|
228
230
|
|
|
229
231
|
&_hasError {
|
|
230
232
|
--input-wrapper-border-width: 1px;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steroidsjs/bootstrap",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.39",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"author": "Vladimir Kozhin <hello@kozhindev.com>",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"react-use": "^17.4.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@steroidsjs/core": "3.0.
|
|
38
|
+
"@steroidsjs/core": "3.0.73",
|
|
39
39
|
"@steroidsjs/eslint-config": "^2.1.6",
|
|
40
40
|
"@types/enzyme": "^3.10.8",
|
|
41
41
|
"@types/googlemaps": "^3.43.3",
|