@v-c/picker 0.0.3 → 0.0.4

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.
Files changed (3) hide show
  1. package/dist/hooks/useTimeInfo.cjs +18 -17
  2. package/dist/hooks/useTimeInfo.js +18 -17
  3. package/package.json +3 -3
package/dist/hooks/useTimeInfo.cjs CHANGED
@@ -92,22 +92,23 @@ function useTimeInfo(generateConfig, props, date) {
92
92
  ];
93
93
  }
94
94
  function findValidateTime(nextTime, getHourUnits, getMinuteUnits, getSecondUnits, getMillisecondUnits, generateConfig) {
95
- const curHour = generateConfig.getHour(nextTime);
96
- const hourUnits = getHourUnits();
97
- const validHour = hourUnits.find((u) => u.value === curHour && !u.disabled)?.value ?? hourUnits.find((u) => !u.disabled)?.value ?? curHour;
98
- let ret = generateConfig.setHour(nextTime, validHour);
99
- const curMinute = generateConfig.getMinute(ret);
100
- const minuteUnits = getMinuteUnits(validHour);
101
- const validMinute = minuteUnits.find((u) => u.value === curMinute && !u.disabled)?.value ?? minuteUnits.find((u) => !u.disabled)?.value ?? curMinute;
102
- ret = generateConfig.setMinute(ret, validMinute);
103
- const curSecond = generateConfig.getSecond(ret);
104
- const secondUnits = getSecondUnits(validHour, validMinute);
105
- const validSecond = secondUnits.find((u) => u.value === curSecond && !u.disabled)?.value ?? secondUnits.find((u) => !u.disabled)?.value ?? curSecond;
106
- ret = generateConfig.setSecond(ret, validSecond);
107
- const curMs = generateConfig.getMillisecond(ret);
108
- const msUnits = getMillisecondUnits(validHour, validMinute, validSecond);
109
- const validMs = msUnits.find((u) => u.value === curMs && !u.disabled)?.value ?? msUnits.find((u) => !u.disabled)?.value ?? curMs;
110
- ret = generateConfig.setMillisecond(ret, validMs);
111
- return ret;
95
+ let nextDate = nextTime;
96
+ function alignValidate(getUnitValue, setUnitValue, units) {
97
+ let nextValue = Reflect.get(generateConfig, getUnitValue)(nextDate);
98
+ const nextUnit = units.find((unit) => unit.value === nextValue);
99
+ if (!nextUnit || nextUnit.disabled) {
100
+ const validateUnits = units.filter((unit) => !unit.disabled);
101
+ const validateUnit = [...validateUnits].reverse().find((unit) => unit.value <= nextValue) || validateUnits[0];
102
+ if (validateUnit) {
103
+ nextValue = validateUnit.value;
104
+ nextDate = Reflect.get(generateConfig, setUnitValue)(nextDate, nextValue);
105
+ }
106
+ }
107
+ return nextValue;
108
+ }
109
+ const nextHour = alignValidate("getHour", "setHour", getHourUnits());
110
+ const nextMinute = alignValidate("getMinute", "setMinute", getMinuteUnits(nextHour));
111
+ alignValidate("getMillisecond", "setMillisecond", getMillisecondUnits(nextHour, nextMinute, alignValidate("getSecond", "setSecond", getSecondUnits(nextHour, nextMinute))));
112
+ return nextDate;
112
113
  }
113
114
  exports.default = useTimeInfo;
package/dist/hooks/useTimeInfo.js CHANGED
@@ -87,22 +87,23 @@ function useTimeInfo(generateConfig, props, date) {
87
87
  ];
88
88
  }
89
89
  function findValidateTime(nextTime, getHourUnits, getMinuteUnits, getSecondUnits, getMillisecondUnits, generateConfig) {
90
- const curHour = generateConfig.getHour(nextTime);
91
- const hourUnits = getHourUnits();
92
- const validHour = hourUnits.find((u) => u.value === curHour && !u.disabled)?.value ?? hourUnits.find((u) => !u.disabled)?.value ?? curHour;
93
- let ret = generateConfig.setHour(nextTime, validHour);
94
- const curMinute = generateConfig.getMinute(ret);
95
- const minuteUnits = getMinuteUnits(validHour);
96
- const validMinute = minuteUnits.find((u) => u.value === curMinute && !u.disabled)?.value ?? minuteUnits.find((u) => !u.disabled)?.value ?? curMinute;
97
- ret = generateConfig.setMinute(ret, validMinute);
98
- const curSecond = generateConfig.getSecond(ret);
99
- const secondUnits = getSecondUnits(validHour, validMinute);
100
- const validSecond = secondUnits.find((u) => u.value === curSecond && !u.disabled)?.value ?? secondUnits.find((u) => !u.disabled)?.value ?? curSecond;
101
- ret = generateConfig.setSecond(ret, validSecond);
102
- const curMs = generateConfig.getMillisecond(ret);
103
- const msUnits = getMillisecondUnits(validHour, validMinute, validSecond);
104
- const validMs = msUnits.find((u) => u.value === curMs && !u.disabled)?.value ?? msUnits.find((u) => !u.disabled)?.value ?? curMs;
105
- ret = generateConfig.setMillisecond(ret, validMs);
106
- return ret;
90
+ let nextDate = nextTime;
91
+ function alignValidate(getUnitValue, setUnitValue, units) {
92
+ let nextValue = Reflect.get(generateConfig, getUnitValue)(nextDate);
93
+ const nextUnit = units.find((unit) => unit.value === nextValue);
94
+ if (!nextUnit || nextUnit.disabled) {
95
+ const validateUnits = units.filter((unit) => !unit.disabled);
96
+ const validateUnit = [...validateUnits].reverse().find((unit) => unit.value <= nextValue) || validateUnits[0];
97
+ if (validateUnit) {
98
+ nextValue = validateUnit.value;
99
+ nextDate = Reflect.get(generateConfig, setUnitValue)(nextDate, nextValue);
100
+ }
101
+ }
102
+ return nextValue;
103
+ }
104
+ const nextHour = alignValidate("getHour", "setHour", getHourUnits());
105
+ const nextMinute = alignValidate("getMinute", "setMinute", getMinuteUnits(nextHour));
106
+ alignValidate("getMillisecond", "setMillisecond", getMillisecondUnits(nextHour, nextMinute, alignValidate("getSecond", "setSecond", getSecondUnits(nextHour, nextMinute))));
107
+ return nextDate;
107
108
  }
108
109
  export { useTimeInfo as default };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@v-c/picker",
3
3
  "type": "module",
4
- "version": "0.0.3",
4
+ "version": "0.0.4",
5
5
  "description": "picker ui component for vue",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -73,8 +73,8 @@
73
73
  },
74
74
  "dependencies": {
75
75
  "@v-c/overflow": "^1.0.1",
76
- "@v-c/util": "^1.0.6",
77
- "@v-c/trigger": "^1.0.2"
76
+ "@v-c/trigger": "^1.0.2",
77
+ "@v-c/util": "^1.0.6"
78
78
  },
79
79
  "devDependencies": {
80
80
  "@types/luxon": "^3.7.1"