@ionic/core 7.5.7 → 7.5.8-dev.11701293337.112ba209

package/dist/collection/components/datetime/utils/parse.js

@@ -14,24 +14,24 @@ const TIME_REGEXP = /^((\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(
  * an array of numbers, and clean up any user input
  */
 export const convertToArrayOfNumbers = (input) => {
-  if (input === undefined) {
-    return;
-  }
-  let processedInput = input;
-  if (typeof input === 'string') {
-    // convert the string to an array of strings
-    // auto remove any whitespace and [] characters
-    processedInput = input.replace(/\[|\]|\s/g, '').split(',');
-  }
-  let values;
-  if (Array.isArray(processedInput)) {
-    // ensure each value is an actual number in the returned array
-    values = processedInput.map((num) => parseInt(num, 10)).filter(isFinite);
-  }
-  else {
-    values = [processedInput];
-  }
-  return values;
+    if (input === undefined) {
+        return;
+    }
+    let processedInput = input;
+    if (typeof input === 'string') {
+        // convert the string to an array of strings
+        // auto remove any whitespace and [] characters
+        processedInput = input.replace(/\[|\]|\s/g, '').split(',');
+    }
+    let values;
+    if (Array.isArray(processedInput)) {
+        // ensure each value is an actual number in the returned array
+        values = processedInput.map((num) => parseInt(num, 10)).filter(isFinite);
+    }
+    else {
+        values = [processedInput];
+    }
+    return values;
 };
 /**
  * Extracts date information
@@ -39,75 +39,75 @@ export const convertToArrayOfNumbers = (input) => {
  * into DatetimeParts.
  */
 export const getPartsFromCalendarDay = (el) => {
-  return {
-    month: parseInt(el.getAttribute('data-month'), 10),
-    day: parseInt(el.getAttribute('data-day'), 10),
-    year: parseInt(el.getAttribute('data-year'), 10),
-    dayOfWeek: parseInt(el.getAttribute('data-day-of-week'), 10),
-  };
+    return {
+        month: parseInt(el.getAttribute('data-month'), 10),
+        day: parseInt(el.getAttribute('data-day'), 10),
+        year: parseInt(el.getAttribute('data-year'), 10),
+        dayOfWeek: parseInt(el.getAttribute('data-day-of-week'), 10),
+    };
 };
 export function parseDate(val) {
-  if (Array.isArray(val)) {
-    const parsedArray = [];
-    for (const valStr of val) {
-      const parsedVal = parseDate(valStr);
-      /**
-       * If any of the values weren't parsed correctly, consider
-       * the entire batch incorrect. This simplifies the type
-       * signatures by having "undefined" be a general error case
-       * instead of returning (Datetime | undefined)[], which is
-       * harder for TS to perform type narrowing on.
-       */
-      if (!parsedVal) {
-        return undefined;
-      }
-      parsedArray.push(parsedVal);
+    if (Array.isArray(val)) {
+        const parsedArray = [];
+        for (const valStr of val) {
+            const parsedVal = parseDate(valStr);
+            /**
+             * If any of the values weren't parsed correctly, consider
+             * the entire batch incorrect. This simplifies the type
+             * signatures by having "undefined" be a general error case
+             * instead of returning (Datetime | undefined)[], which is
+             * harder for TS to perform type narrowing on.
+             */
+            if (!parsedVal) {
+                return undefined;
+            }
+            parsedArray.push(parsedVal);
+        }
+        return parsedArray;
     }
-    return parsedArray;
-  }
-  // manually parse IS0 cuz Date.parse cannot be trusted
-  // ISO 8601 format: 1994-12-15T13:47:20Z
-  let parse = null;
-  if (val != null && val !== '') {
-    // try parsing for just time first, HH:MM
-    parse = TIME_REGEXP.exec(val);
-    if (parse) {
-      // adjust the array so it fits nicely with the datetime parse
-      parse.unshift(undefined, undefined);
-      parse[2] = parse[3] = undefined;
+    // manually parse IS0 cuz Date.parse cannot be trusted
+    // ISO 8601 format: 1994-12-15T13:47:20Z
+    let parse = null;
+    if (val != null && val !== '') {
+        // try parsing for just time first, HH:MM
+        parse = TIME_REGEXP.exec(val);
+        if (parse) {
+            // adjust the array so it fits nicely with the datetime parse
+            parse.unshift(undefined, undefined);
+            parse[2] = parse[3] = undefined;
+        }
+        else {
+            // try parsing for full ISO datetime
+            parse = ISO_8601_REGEXP.exec(val);
+        }
     }
-    else {
-      // try parsing for full ISO datetime
-      parse = ISO_8601_REGEXP.exec(val);
+    if (parse === null) {
+        // wasn't able to parse the ISO datetime
+        printIonWarning(`Unable to parse date string: ${val}. Please provide a valid ISO 8601 datetime string.`);
+        return undefined;
+    }
+    // ensure all the parse values exist with at least 0
+    for (let i = 1; i < 8; i++) {
+        parse[i] = parse[i] !== undefined ? parseInt(parse[i], 10) : undefined;
     }
-  }
-  if (parse === null) {
-    // wasn't able to parse the ISO datetime
-    printIonWarning(`Unable to parse date string: ${val}. Please provide a valid ISO 8601 datetime string.`);
-    return undefined;
-  }
-  // ensure all the parse values exist with at least 0
-  for (let i = 1; i < 8; i++) {
-    parse[i] = parse[i] !== undefined ? parseInt(parse[i], 10) : undefined;
-  }
-  // can also get second and millisecond from parse[6] and parse[7] if needed
-  return {
-    year: parse[1],
-    month: parse[2],
-    day: parse[3],
-    hour: parse[4],
-    minute: parse[5],
-    ampm: parse[4] < 12 ? 'am' : 'pm',
-  };
+    // can also get second and millisecond from parse[6] and parse[7] if needed
+    return {
+        year: parse[1],
+        month: parse[2],
+        day: parse[3],
+        hour: parse[4],
+        minute: parse[5],
+        ampm: parse[4] < 12 ? 'am' : 'pm',
+    };
 }
 export const clampDate = (dateParts, minParts, maxParts) => {
-  if (minParts && isBefore(dateParts, minParts)) {
-    return minParts;
-  }
-  else if (maxParts && isAfter(dateParts, maxParts)) {
-    return maxParts;
-  }
-  return dateParts;
+    if (minParts && isBefore(dateParts, minParts)) {
+        return minParts;
+    }
+    else if (maxParts && isAfter(dateParts, maxParts)) {
+        return maxParts;
+    }
+    return dateParts;
 };
 /**
  * Parses an hour and returns if the value is in the morning (am) or afternoon (pm).
@@ -115,7 +115,7 @@ export const clampDate = (dateParts, minParts, maxParts) => {
  * @returns `pm` if the hour is greater than or equal to 12, `am` if less than 12.
  */
 export const parseAmPm = (hour) => {
-  return hour >= 12 ? 'pm' : 'am';
+    return hour >= 12 ? 'pm' : 'am';
 };
 /**
  * Takes a max date string and creates a DatetimeParts
@@ -124,38 +124,38 @@ export const parseAmPm = (hour) => {
  * month, day, hour, and minute information.
  */
 export const parseMaxParts = (max, todayParts) => {
-  const result = parseDate(max);
-  /**
-   * If min was not a valid date then return undefined.
-   */
-  if (result === undefined) {
-    return;
-  }
-  const { month, day, year, hour, minute } = result;
-  /**
-   * When passing in `max` or `min`, developers
-   * can pass in any ISO-8601 string. This means
-   * that not all of the date/time fields are defined.
-   * For example, passing max="2012" is valid even though
-   * there is no month, day, hour, or minute data.
-   * However, all of this data is required when clamping the date
-   * so that the correct initial value can be selected. As a result,
-   * we need to fill in any omitted data with the min or max values.
-   */
-  const yearValue = year !== null && year !== void 0 ? year : todayParts.year;
-  const monthValue = month !== null && month !== void 0 ? month : 12;
-  return {
-    month: monthValue,
-    day: day !== null && day !== void 0 ? day : getNumDaysInMonth(monthValue, yearValue),
+    const result = parseDate(max);
+    /**
+     * If min was not a valid date then return undefined.
+     */
+    if (result === undefined) {
+        return;
+    }
+    const { month, day, year, hour, minute } = result;
     /**
-     * Passing in "HH:mm" is a valid ISO-8601
-     * string, so we just default to the current year
-     * in this case.
+     * When passing in `max` or `min`, developers
+     * can pass in any ISO-8601 string. This means
+     * that not all of the date/time fields are defined.
+     * For example, passing max="2012" is valid even though
+     * there is no month, day, hour, or minute data.
+     * However, all of this data is required when clamping the date
+     * so that the correct initial value can be selected. As a result,
+     * we need to fill in any omitted data with the min or max values.
      */
-    year: yearValue,
-    hour: hour !== null && hour !== void 0 ? hour : 23,
-    minute: minute !== null && minute !== void 0 ? minute : 59,
-  };
+    const yearValue = year !== null && year !== void 0 ? year : todayParts.year;
+    const monthValue = month !== null && month !== void 0 ? month : 12;
+    return {
+        month: monthValue,
+        day: day !== null && day !== void 0 ? day : getNumDaysInMonth(monthValue, yearValue),
+        /**
+         * Passing in "HH:mm" is a valid ISO-8601
+         * string, so we just default to the current year
+         * in this case.
+         */
+        year: yearValue,
+        hour: hour !== null && hour !== void 0 ? hour : 23,
+        minute: minute !== null && minute !== void 0 ? minute : 59,
+    };
 };
 /**
  * Takes a min date string and creates a DatetimeParts
@@ -164,34 +164,34 @@ export const parseMaxParts = (max, todayParts) => {
  * month, day, hour, and minute information.
  */
 export const parseMinParts = (min, todayParts) => {
-  const result = parseDate(min);
-  /**
-   * If min was not a valid date then return undefined.
-   */
-  if (result === undefined) {
-    return;
-  }
-  const { month, day, year, hour, minute } = result;
-  /**
-   * When passing in `max` or `min`, developers
-   * can pass in any ISO-8601 string. This means
-   * that not all of the date/time fields are defined.
-   * For example, passing max="2012" is valid even though
-   * there is no month, day, hour, or minute data.
-   * However, all of this data is required when clamping the date
-   * so that the correct initial value can be selected. As a result,
-   * we need to fill in any omitted data with the min or max values.
-   */
-  return {
-    month: month !== null && month !== void 0 ? month : 1,
-    day: day !== null && day !== void 0 ? day : 1,
+    const result = parseDate(min);
+    /**
+     * If min was not a valid date then return undefined.
+     */
+    if (result === undefined) {
+        return;
+    }
+    const { month, day, year, hour, minute } = result;
     /**
-     * Passing in "HH:mm" is a valid ISO-8601
-     * string, so we just default to the current year
-     * in this case.
+     * When passing in `max` or `min`, developers
+     * can pass in any ISO-8601 string. This means
+     * that not all of the date/time fields are defined.
+     * For example, passing max="2012" is valid even though
+     * there is no month, day, hour, or minute data.
+     * However, all of this data is required when clamping the date
+     * so that the correct initial value can be selected. As a result,
+     * we need to fill in any omitted data with the min or max values.
      */
-    year: year !== null && year !== void 0 ? year : todayParts.year,
-    hour: hour !== null && hour !== void 0 ? hour : 0,
-    minute: minute !== null && minute !== void 0 ? minute : 0,
-  };
+    return {
+        month: month !== null && month !== void 0 ? month : 1,
+        day: day !== null && day !== void 0 ? day : 1,
+        /**
+         * Passing in "HH:mm" is a valid ISO-8601
+         * string, so we just default to the current year
+         * in this case.
+         */
+        year: year !== null && year !== void 0 ? year : todayParts.year,
+        hour: hour !== null && hour !== void 0 ? hour : 0,
+        minute: minute !== null && minute !== void 0 ? minute : 0,
+    };
 };

package/dist/collection/components/datetime/utils/state.js

@@ -6,13 +6,13 @@ import { isAfter, isBefore, isSameDay } from "./comparison";
 import { generateDayAriaLabel, getDay } from "./format";
 import { getNextMonth, getPreviousMonth } from "./manipulation";
 export const isYearDisabled = (refYear, minParts, maxParts) => {
-  if (minParts && minParts.year > refYear) {
-    return true;
-  }
-  if (maxParts && maxParts.year < refYear) {
-    return true;
-  }
-  return false;
+    if (minParts && minParts.year > refYear) {
+        return true;
+    }
+    if (maxParts && maxParts.year < refYear) {
+        return true;
+    }
+    return false;
 };
 /**
  * Returns true if a given day should
@@ -20,104 +20,104 @@ export const isYearDisabled = (refYear, minParts, maxParts) => {
  * or the max/min dates.
  */
 export const isDayDisabled = (refParts, minParts, maxParts, dayValues) => {
-  /**
-   * If this is a filler date (i.e. padding)
-   * then the date is disabled.
-   */
-  if (refParts.day === null) {
-    return true;
-  }
-  /**
-   * If user passed in a list of acceptable day values
-   * check to make sure that the date we are looking
-   * at is in this array.
-   */
-  if (dayValues !== undefined && !dayValues.includes(refParts.day)) {
-    return true;
-  }
-  /**
-   * Given a min date, perform the following
-   * checks. If any of them are true, then the
-   * day should be disabled:
-   * 1. Is the current year < the min allowed year?
-   * 2. Is the current year === min allowed year,
-   * but the current month < the min allowed month?
-   * 3. Is the current year === min allowed year, the
-   * current month === min allow month, but the current
-   * day < the min allowed day?
-   */
-  if (minParts && isBefore(refParts, minParts)) {
-    return true;
-  }
-  /**
-   * Given a max date, perform the following
-   * checks. If any of them are true, then the
-   * day should be disabled:
-   * 1. Is the current year > the max allowed year?
-   * 2. Is the current year === max allowed year,
-   * but the current month > the max allowed month?
-   * 3. Is the current year === max allowed year, the
-   * current month === max allow month, but the current
-   * day > the max allowed day?
-   */
-  if (maxParts && isAfter(refParts, maxParts)) {
-    return true;
-  }
-  /**
-   * If none of these checks
-   * passed then the date should
-   * be interactive.
-   */
-  return false;
+    /**
+     * If this is a filler date (i.e. padding)
+     * then the date is disabled.
+     */
+    if (refParts.day === null) {
+        return true;
+    }
+    /**
+     * If user passed in a list of acceptable day values
+     * check to make sure that the date we are looking
+     * at is in this array.
+     */
+    if (dayValues !== undefined && !dayValues.includes(refParts.day)) {
+        return true;
+    }
+    /**
+     * Given a min date, perform the following
+     * checks. If any of them are true, then the
+     * day should be disabled:
+     * 1. Is the current year < the min allowed year?
+     * 2. Is the current year === min allowed year,
+     * but the current month < the min allowed month?
+     * 3. Is the current year === min allowed year, the
+     * current month === min allow month, but the current
+     * day < the min allowed day?
+     */
+    if (minParts && isBefore(refParts, minParts)) {
+        return true;
+    }
+    /**
+     * Given a max date, perform the following
+     * checks. If any of them are true, then the
+     * day should be disabled:
+     * 1. Is the current year > the max allowed year?
+     * 2. Is the current year === max allowed year,
+     * but the current month > the max allowed month?
+     * 3. Is the current year === max allowed year, the
+     * current month === max allow month, but the current
+     * day > the max allowed day?
+     */
+    if (maxParts && isAfter(refParts, maxParts)) {
+        return true;
+    }
+    /**
+     * If none of these checks
+     * passed then the date should
+     * be interactive.
+     */
+    return false;
 };
 /**
  * Given a locale, a date, the selected date(s), and today's date,
  * generate the state for a given calendar day button.
  */
 export const getCalendarDayState = (locale, refParts, activeParts, todayParts, minParts, maxParts, dayValues) => {
-  /**
-   * activeParts signals what day(s) are currently selected in the datetime.
-   * If multiple="true", this will be an array, but the logic in this util
-   * is the same whether we have one selected day or many because we're only
-   * calculating the state for one button. So, we treat a single activeParts value
-   * the same as an array of length one.
-   */
-  const activePartsArray = Array.isArray(activeParts) ? activeParts : [activeParts];
-  /**
-   * The day button is active if it is selected, or in other words, if refParts
-   * matches at least one selected date.
-   */
-  const isActive = activePartsArray.find((parts) => isSameDay(refParts, parts)) !== undefined;
-  const isToday = isSameDay(refParts, todayParts);
-  const disabled = isDayDisabled(refParts, minParts, maxParts, dayValues);
-  /**
-   * Note that we always return one object regardless of whether activeParts
-   * was an array, since we pare down to one value for isActive.
-   */
-  return {
-    disabled,
-    isActive,
-    isToday,
-    ariaSelected: isActive ? 'true' : null,
-    ariaLabel: generateDayAriaLabel(locale, isToday, refParts),
-    text: refParts.day != null ? getDay(locale, refParts) : null,
-  };
+    /**
+     * activeParts signals what day(s) are currently selected in the datetime.
+     * If multiple="true", this will be an array, but the logic in this util
+     * is the same whether we have one selected day or many because we're only
+     * calculating the state for one button. So, we treat a single activeParts value
+     * the same as an array of length one.
+     */
+    const activePartsArray = Array.isArray(activeParts) ? activeParts : [activeParts];
+    /**
+     * The day button is active if it is selected, or in other words, if refParts
+     * matches at least one selected date.
+     */
+    const isActive = activePartsArray.find((parts) => isSameDay(refParts, parts)) !== undefined;
+    const isToday = isSameDay(refParts, todayParts);
+    const disabled = isDayDisabled(refParts, minParts, maxParts, dayValues);
+    /**
+     * Note that we always return one object regardless of whether activeParts
+     * was an array, since we pare down to one value for isActive.
+     */
+    return {
+        disabled,
+        isActive,
+        isToday,
+        ariaSelected: isActive ? 'true' : null,
+        ariaLabel: generateDayAriaLabel(locale, isToday, refParts),
+        text: refParts.day != null ? getDay(locale, refParts) : null,
+    };
 };
 /**
  * Returns `true` if the month is disabled given the
  * current date value and min/max date constraints.
  */
 export const isMonthDisabled = (refParts, { minParts, maxParts, }) => {
-  // If the year is disabled then the month is disabled.
-  if (isYearDisabled(refParts.year, minParts, maxParts)) {
-    return true;
-  }
-  // If the date value is before the min date, then the month is disabled.
-  // If the date value is after the max date, then the month is disabled.
-  if ((minParts && isBefore(refParts, minParts)) || (maxParts && isAfter(refParts, maxParts))) {
-    return true;
-  }
-  return false;
+    // If the year is disabled then the month is disabled.
+    if (isYearDisabled(refParts.year, minParts, maxParts)) {
+        return true;
+    }
+    // If the date value is before the min date, then the month is disabled.
+    // If the date value is after the max date, then the month is disabled.
+    if ((minParts && isBefore(refParts, minParts)) || (maxParts && isAfter(refParts, maxParts))) {
+        return true;
+    }
+    return false;
 };
 /**
  * Given a working date, an optional minimum date range,
@@ -125,21 +125,21 @@ export const isMonthDisabled = (refParts, { minParts, maxParts, }) => {
  * previous navigation button is disabled.
  */
 export const isPrevMonthDisabled = (refParts, minParts, maxParts) => {
-  const prevMonth = Object.assign(Object.assign({}, getPreviousMonth(refParts)), { day: null });
-  return isMonthDisabled(prevMonth, {
-    minParts,
-    maxParts,
-  });
+    const prevMonth = Object.assign(Object.assign({}, getPreviousMonth(refParts)), { day: null });
+    return isMonthDisabled(prevMonth, {
+        minParts,
+        maxParts,
+    });
 };
 /**
  * Given a working date and a maximum date range,
  * determine if the next navigation button is disabled.
  */
 export const isNextMonthDisabled = (refParts, maxParts) => {
-  const nextMonth = Object.assign(Object.assign({}, getNextMonth(refParts)), { day: null });
-  return isMonthDisabled(nextMonth, {
-    maxParts,
-  });
+    const nextMonth = Object.assign(Object.assign({}, getNextMonth(refParts)), { day: null });
+    return isMonthDisabled(nextMonth, {
+        maxParts,
+    });
 };
 /**
  * Given the value of the highlightedDates property
@@ -147,27 +147,27 @@ export const isNextMonthDisabled = (refParts, maxParts) => {
  * that date, or undefined if none are found.
  */
 export const getHighlightStyles = (highlightedDates, dateIsoString, el) => {
-  if (Array.isArray(highlightedDates)) {
-    const dateStringWithoutTime = dateIsoString.split('T')[0];
-    const matchingHighlight = highlightedDates.find((hd) => hd.date === dateStringWithoutTime);
-    if (matchingHighlight) {
-      return {
-        textColor: matchingHighlight.textColor,
-        backgroundColor: matchingHighlight.backgroundColor,
-      };
-    }
-  }
-  else {
-    /**
-     * Wrap in a try-catch to prevent exceptions in the user's function
-     * from interrupting the calendar's rendering.
-     */
-    try {
-      return highlightedDates(dateIsoString);
+    if (Array.isArray(highlightedDates)) {
+        const dateStringWithoutTime = dateIsoString.split('T')[0];
+        const matchingHighlight = highlightedDates.find((hd) => hd.date === dateStringWithoutTime);
+        if (matchingHighlight) {
+            return {
+                textColor: matchingHighlight.textColor,
+                backgroundColor: matchingHighlight.backgroundColor,
+            };
+        }
     }
-    catch (e) {
-      printIonError('Exception thrown from provided `highlightedDates` callback. Please check your function and try again.', el, e);
+    else {
+        /**
+         * Wrap in a try-catch to prevent exceptions in the user's function
+         * from interrupting the calendar's rendering.
+         */
+        try {
+            return highlightedDates(dateIsoString);
+        }
+        catch (e) {
+            printIonError('Exception thrown from provided `highlightedDates` callback. Please check your function and try again.', el, e);
+        }
     }
-  }
-  return undefined;
+    return undefined;
 };