antd-mobile 5.39.0 → 5.40.0

package/es/components/date-picker/date-picker-week-utils.js

@@ -25,6 +25,7 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
   const minWeekday = minDay.isoWeekday();
   const maxWeekday = maxDay.isoWeekday();
   const selectedWeek = parseInt(selected[1]);
+  const selectedWeekday = parseInt(selected[2]);
   const isInMinWeek = isInMinYear && selectedWeek === minWeek;
   const isInMaxWeek = isInMaxYear && selectedWeek === maxWeek;
   const selectedYearWeeks = dayjs(`${selectedYear}-01-01`).isoWeeksInYear();
@@ -50,7 +51,9 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
     const upper = maxYear;
     const years = generateColumn(lower, upper, 'year');
     ret.push(years.map(v => ({
-      label: renderLabel('year', v),
+      label: renderLabel('year', v, {
+        selected: selectedYear === v
+      }),
       value: v.toString()
     })));
   }
@@ -59,7 +62,9 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
     const upper = isInMaxYear ? maxWeek : selectedYearWeeks;
     const weeks = generateColumn(lower, upper, 'week');
     ret.push(weeks.map(v => ({
-      label: renderLabel('week', v),
+      label: renderLabel('week', v, {
+        selected: selectedWeek === v
+      }),
       value: v.toString()
     })));
   }
@@ -68,7 +73,9 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
     const upper = isInMaxWeek ? maxWeekday : 7;
     const weeks = generateColumn(lower, upper, 'week-day');
     ret.push(weeks.map(v => ({
-      label: renderLabel('week-day', v),
+      label: renderLabel('week-day', v, {
+        selected: selectedWeekday === v
+      }),
       value: v.toString()
     })));
   }

package/es/components/date-picker-view/date-picker-view.d.ts

@@ -1,9 +1,11 @@
 import type { FC, ReactNode } from 'react';
-import type { PickerViewProps } from '../picker-view';
 import { NativeProps } from '../../utils/native-props';
-import type { Precision, DatePickerFilter } from '../date-picker/date-picker-utils';
+import type { DatePickerFilter, Precision } from '../date-picker/date-picker-utils';
 import type { PickerDate } from '../date-picker/util';
-export declare type RenderLabel = (type: Precision | 'now', data: number) => ReactNode;
+import type { PickerViewProps } from '../picker-view';
+export declare type RenderLabel = (type: Precision | 'now', data: number, info: {
+    selected: boolean;
+}) => ReactNode;
 export declare type DatePickerViewProps = Pick<PickerViewProps, 'style' | 'mouseWheel' | 'loading' | 'loadingContent'> & {
     value?: PickerDate;
     defaultValue?: PickerDate;

package/es/components/date-picker-view/date-picker-view.js

@@ -1,11 +1,11 @@
 import React, { useCallback, useMemo } from 'react';
-import PickerView from '../picker-view';
 import { withNativeProps } from '../../utils/native-props';
-import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
-import { generateDatePickerColumns, convertDateToStringArray, convertStringArrayToDate } from '../date-picker/date-picker-utils';
-import useRenderLabel from './useRenderLabel';
+import { mergeProps } from '../../utils/with-default-props';
+import { convertDateToStringArray, convertStringArrayToDate, generateDatePickerColumns } from '../date-picker/date-picker-utils';
 import { TILL_NOW } from '../date-picker/util';
+import PickerView from '../picker-view';
+import useRenderLabel from './useRenderLabel';
 const thisYear = new Date().getFullYear();
 const defaultProps = {
   min: new Date(new Date().setFullYear(thisYear - 10)),

package/es/components/date-picker-view/useRenderLabel.js

@@ -4,9 +4,9 @@ export default function useRenderLabel(renderLabel) {
   const {
     locale
   } = useConfig();
-  return useCallback((type, data) => {
+  return useCallback((type, data, info) => {
     if (renderLabel) {
-      return renderLabel(type, data);
+      return renderLabel(type, data, info);
     }
     // Default render
     switch (type) {

package/es/components/number-keyboard/number-keyboard.d.ts

@@ -14,5 +14,5 @@ export declare type NumberKeyboardProps = {
     onConfirm?: () => void;
     closeOnConfirm?: boolean;
     safeArea?: boolean;
-} & Pick<PopupProps, 'afterClose' | 'afterShow' | 'getContainer' | 'destroyOnClose' | 'forceRender' | 'stopPropagation'> & NativeProps;
+} & Pick<PopupProps, 'afterClose' | 'afterShow' | 'getContainer' | 'destroyOnClose' | 'forceRender' | 'stopPropagation'> & NativeProps<'--adm-safe-area-multiple'>;
 export declare const NumberKeyboard: FC<NumberKeyboardProps>;

package/es/components/popover/wrapper.d.ts

@@ -1,10 +1,7 @@
-import React from 'react';
-import type { ReactNode } from 'react';
-export declare class Wrapper extends React.Component<{
-    children?: ReactNode;
-}, {}> {
-    element: Element | null;
-    componentDidMount(): void;
-    componentDidUpdate(): void;
-    render(): React.ReactNode;
+import * as React from 'react';
+export interface WrapperRef {
+    element: HTMLElement;
 }
+export declare const Wrapper: React.ForwardRefExoticComponent<{
+    children?: React.ReactNode;
+} & React.RefAttributes<WrapperRef>>;

package/es/components/popover/wrapper.js

@@ -1,6 +1,7 @@
-import React from 'react';
-import { findDOMNode } from 'react-dom';
-export class Wrapper extends React.Component {
+import findDOMNode, { getDOM } from 'rc-util/lib/Dom/findDOMNode';
+import { composeRef, getNodeRef, supportRef } from 'rc-util/lib/ref';
+import * as React from 'react';
+class LegacyWrapper extends React.Component {
   constructor() {
     super(...arguments);
     this.element = null;
@@ -18,6 +19,30 @@ export class Wrapper extends React.Component {
     }
   }
   render() {
-    return React.Children.only(this.props.children);
+    return this.props.children;
   }
-}
+}
+export const Wrapper = React.forwardRef(({
+  children
+}, ref) => {
+  const elementRef = React.useRef(null);
+  const legacyWrapperRef = React.createRef();
+  const child = React.Children.only(children);
+  const canUseRef = supportRef(children);
+  const getElement = () => {
+    var _a;
+    if (canUseRef) {
+      return getDOM(elementRef.current);
+    }
+    return (_a = legacyWrapperRef.current) === null || _a === void 0 ? void 0 : _a.element;
+  };
+  React.useImperativeHandle(ref, () => ({
+    element: getElement()
+  }));
+  const composedRef = composeRef(elementRef, getNodeRef(child));
+  return canUseRef ? React.cloneElement(child, {
+    ref: composedRef
+  }) : React.createElement(LegacyWrapper, {
+    ref: legacyWrapperRef
+  }, child);
+});

package/es/components/space/space.css

@@ -19,12 +19,12 @@
 .adm-space-horizontal {
   flex-direction: row;
 }
+.adm-space-horizontal:not(:empty) {
+  margin-right: calc(var(--gap-horizontal) * -1);
+}
 .adm-space-horizontal > .adm-space-item {
   margin-right: var(--gap-horizontal);
 }
-.adm-space-horizontal > .adm-space-item:last-child {
-  margin-right: 0;
-}
 .adm-space-horizontal.adm-space-wrap {
   flex-wrap: wrap;
   margin-bottom: calc(var(--gap-vertical) * -1);

package/es/components/virtual-input/virtual-input.css

@@ -26,8 +26,10 @@
   z-index: 1;
   width: 100%;
   max-width: 100%;
+  min-height: 1.5em;
   overflow-y: hidden;
   overflow-x: scroll;
+  letter-spacing: 1px;
   scrollbar-width: none;
 }
 .adm-virtual-input-content::-webkit-scrollbar {
@@ -50,6 +52,7 @@
   height: 1.3em;
   vertical-align: top;
   margin-right: 1px;
+  position: absolute;
 }
 .adm-virtual-input-caret {
   width: 100%;

package/es/components/virtual-input/virtual-input.js

@@ -20,6 +20,7 @@ export const VirtualInput = forwardRef((props, ref) => {
   const rootRef = useRef(null);
   const contentRef = useRef(null);
   const [hasFocus, setHasFocus] = useState(false);
+  const [caretPosition, setCaretPosition] = useState(value.length); // 光标位置，从 0 开始，如值是 2 则表示光标在顺序下标为 2 的数字之前
   const clearIcon = mergeProp(React.createElement(CloseCircleFill, null), componentConfig.clearIcon, props.clearIcon);
   function scrollToEnd() {
     const root = rootRef.current;
@@ -63,12 +64,17 @@ export const VirtualInput = forwardRef((props, ref) => {
   const keyboardElement = keyboard && React.cloneElement(keyboard, {
     onInput: v => {
       var _a, _b;
-      setValue(value + v);
+      const newValue = value.substring(0, caretPosition) + v + value.substring(caretPosition);
+      setValue(newValue);
+      setCaretPosition(c => c + 1);
       (_b = (_a = keyboard.props).onInput) === null || _b === void 0 ? void 0 : _b.call(_a, v);
     },
     onDelete: () => {
       var _a, _b;
-      setValue(value.slice(0, -1));
+      if (caretPosition === 0) return;
+      const newValue = value.substring(0, caretPosition - 1) + value.substring(caretPosition);
+      setValue(newValue);
+      setCaretPosition(caretPosition - 1);
       (_b = (_a = keyboard.props).onDelete) === null || _b === void 0 ? void 0 : _b.call(_a);
     },
     visible: hasFocus,
@@ -86,6 +92,21 @@ export const VirtualInput = forwardRef((props, ref) => {
     },
     getContainer: null
   });
+  // 点击输入框时，将光标置于最后
+  const setCaretPositionToEnd = () => {
+    setCaretPosition(value.length);
+  };
+  // 点击单个字符时，根据点击位置置于字符前或后
+  const changeCaretPosition = index => e => {
+    e.stopPropagation();
+    const rect = e.target.getBoundingClientRect();
+    const midX = rect.left + rect.width / 2;
+    const clickX = e.clientX;
+    // 点击区域是否偏右
+    const isRight = clickX > midX;
+    setCaretPosition(isRight ? index + 1 : index);
+  };
+  const chars = (value + '').split('');
   return withNativeProps(mergedProps, React.createElement("div", {
     ref: rootRef,
     className: classNames(classPrefix, {
@@ -100,17 +121,25 @@ export const VirtualInput = forwardRef((props, ref) => {
     className: `${classPrefix}-content`,
     ref: contentRef,
     "aria-disabled": mergedProps.disabled,
-    "aria-label": mergedProps.placeholder
-  }, value, React.createElement("div", {
+    "aria-label": mergedProps.placeholder,
+    onClick: setCaretPositionToEnd
+  }, chars.slice(0, caretPosition).map((i, index) => React.createElement("span", {
+    key: index,
+    onClick: changeCaretPosition(index)
+  }, i)), React.createElement("div", {
     className: `${classPrefix}-caret-container`
   }, hasFocus && React.createElement("div", {
     className: `${classPrefix}-caret`
-  }))), mergedProps.clearable && !!value && hasFocus && React.createElement("div", {
+  })), chars.slice(caretPosition).map((i, index) => React.createElement("span", {
+    key: index,
+    onClick: changeCaretPosition(index + caretPosition)
+  }, i))), mergedProps.clearable && !!value && hasFocus && React.createElement("div", {
     className: `${classPrefix}-clear`,
     onClick: e => {
       var _a;
       e.stopPropagation();
       setValue('');
+      setCaretPosition(0);
       (_a = mergedProps.onClear) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
     },
     role: 'button',

package/es/index.d.ts

@@ -168,3 +168,4 @@ export { default as Footer } from './components/footer';
 export type { FooterProps } from './components/footer';
 export { createErrorBlock } from './components/error-block';
 export { reduceMotion, restoreMotion } from './utils/reduce-and-restore-motion';
+export { unstableSetRender } from './utils/unstable-render';

package/es/index.js

@@ -84,4 +84,6 @@ export { default as VirtualInput } from './components/virtual-input';
 export { default as WaterMark } from './components/water-mark';
 export { default as Footer } from './components/footer';
 export { createErrorBlock } from './components/error-block';
-export { reduceMotion, restoreMotion } from './utils/reduce-and-restore-motion';
+export { reduceMotion, restoreMotion } from './utils/reduce-and-restore-motion';
+// compatible
+export { unstableSetRender } from './utils/unstable-render';

package/es/locales/ar-SA.d.ts

@@ -11,6 +11,7 @@ declare const arSA: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/ar-SA.js

@@ -14,6 +14,7 @@ const arSA = mergeLocale(base, {
     'confirm': 'تأكيد',
     'start': 'يبدأ',
     'end': 'ينهي',
+    'startAndEnd': 'يبدأ/ينهي',
     'today': 'اليوم',
     'markItems': ['واحد', 'اثنين', 'ثلاثة', 'أربعة', 'خمسة', 'ستة', 'يوم'],
     'yearAndMonth': '${year} سنة ${month} شهر'

package/es/locales/base.d.ts

@@ -11,6 +11,7 @@ export declare const base: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/base.js

@@ -12,6 +12,7 @@ export const base = {
     confirm: 'Confirm',
     start: 'start',
     end: 'end',
+    startAndEnd: 'start/end',
     today: 'today',
     markItems: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
     yearAndMonth: '${year}/${month}'

package/es/locales/cnr-ME.d.ts

@@ -11,6 +11,7 @@ declare const cnrME: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/cnr-ME.js

@@ -14,6 +14,7 @@ const cnrME = mergeLocale(base, {
     confirm: 'Potvrdi',
     start: 'početak',
     end: 'kraj',
+    startAndEnd: 'početak/kraj',
     today: 'danas',
     markItems: ['Pon', 'Uto', 'Sre', 'Čet', 'Pet', 'Sub', 'Ned'],
     yearAndMonth: '${year}/${month}'

package/es/locales/da-DK.d.ts

@@ -11,6 +11,7 @@ declare const daDK: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/de-DE.d.ts

@@ -11,6 +11,7 @@ declare const deDE: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/de-DE.js

@@ -14,6 +14,7 @@ const deDE = mergeLocale(base, {
     'confirm': 'Bestätigen',
     'start': 'Starten',
     'end': 'Beenden',
+    'startAndEnd': 'Starten/Beenden',
     'today': 'Heute',
     'markItems': ['I', 'II', 'III', 'IV', 'V', 'Sechs', 'Tag'],
     'yearAndMonth': '${year}Jahr${month}Monat'

package/es/locales/en-US.d.ts

@@ -11,6 +11,7 @@ declare const enUS: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/es-ES.d.ts

@@ -11,6 +11,7 @@ declare const esES: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/fa-IR.d.ts

@@ -11,6 +11,7 @@ declare const faIR: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/fr-FR.d.ts

@@ -11,6 +11,7 @@ declare const frFR: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/hr-HR.d.ts

@@ -11,6 +11,7 @@ declare const hrHR: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/hr-HR.js

@@ -14,6 +14,7 @@ const hrHR = mergeLocale(base, {
     confirm: 'Potvrdi',
     start: 'početak',
     end: 'kraj',
+    startAndEnd: 'početak/kraj',
     today: 'danas',
     markItems: ['Pon', 'Uto', 'Sri', 'Čet', 'Pet', 'Sub', 'Ned'],
     yearAndMonth: '${year}/${month}'

package/es/locales/hu-HU.d.ts

@@ -11,6 +11,7 @@ export declare const huHU: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/id-ID.d.ts

@@ -11,6 +11,7 @@ declare const idID: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/in-ID.d.ts

@@ -11,6 +11,7 @@ declare const inID: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/in-ID.js

@@ -14,6 +14,7 @@ const inID = mergeLocale(base, {
     confirm: 'OK',
     start: 'Mulai',
     end: 'Selesai',
+    startAndEnd: 'Mulai/Selesai',
     today: 'Hari Ini',
     markItems: ['Senin', 'Selasa', 'Rabu', 'Kamis', 'Jumat', 'Sabtu', 'Minggu'],
     yearAndMonth: '${year} Tahun ${month} Bulan'

package/es/locales/it-IT.d.ts

@@ -11,6 +11,7 @@ declare const itIT: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/ja-JP.d.ts

@@ -11,6 +11,7 @@ declare const jaJP: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/kk-KZ.d.ts

@@ -11,6 +11,7 @@ declare const kkKZ: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/ko-KR.d.ts

@@ -11,6 +11,7 @@ declare const koKR: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/ms-MY.d.ts

@@ -11,6 +11,7 @@ declare const msMY: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/ms-MY.js

@@ -14,6 +14,7 @@ const msMY = mergeLocale(base, {
     'confirm': 'Ok',
     'start': 'Mula',
     'end': 'Tamat',
+    'startAndEnd': 'Mula/Tamat',
     'today': 'Hari ini',
     'markItems': ['Satu', 'Dua', 'Tiga', 'Empat', 'Lima', 'Enam', 'Hari'],
     'yearAndMonth': 'Tahun${year} bulan ${month}'

package/es/locales/nb-NO.d.ts

@@ -11,6 +11,7 @@ declare const nbNO: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/nl-NL.d.ts

@@ -11,6 +11,7 @@ declare const nlNL: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/pt-BR.d.ts

@@ -11,6 +11,7 @@ declare const ptBR: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/ru-RU.d.ts

@@ -11,6 +11,7 @@ declare const ruRU: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/ru-RU.js

@@ -10,6 +10,12 @@ const ruRU = mergeLocale(base, {
     close: 'Закрыть'
   },
   Calendar: {
+    title: 'Выбор даты',
+    confirm: 'Подтвердить',
+    start: 'начало',
+    end: 'конец',
+    startAndEnd: 'начало/конец',
+    today: 'сегодня',
     markItems: ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'],
     yearAndMonth: '${year}/${month}'
   },
@@ -113,9 +119,9 @@ const ruRU = mergeLocale(base, {
     name: 'Ввод пароля'
   },
   PullToRefresh: {
-    pulling: 'Прокрутите вниз, чтобы обновления',
+    pulling: 'Прокрутите вниз, чтобы обновить',
     canRelease: 'Отпустите, чтобы немедленно обновить',
-    complete: 'Обновление успешно'
+    complete: 'Обновлено успешно'
   },
   SearchBar: {
     name: 'Панель поиска'

package/es/locales/sr-RS.d.ts

@@ -11,6 +11,7 @@ declare const srRS: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/sr-RS.js

@@ -14,6 +14,7 @@ const srRS = mergeLocale(base, {
     confirm: 'Потврди',
     start: 'почетак',
     end: 'крај',
+    startAndEnd: 'почетак/крај',
     today: 'данас',
     markItems: ['Пон', 'Уто', 'Сре', 'Чет', 'Пет', 'Суб', 'Нед'],
     yearAndMonth: '${year}/${month}'

package/es/locales/th-TH.d.ts

@@ -11,6 +11,7 @@ declare const thTH: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/th-TH.js

@@ -14,6 +14,7 @@ const thTH = mergeLocale(base, {
     confirm: 'ยืนยัน',
     start: 'เริ่ม',
     end: 'เสร็จ',
+    startAndEnd: 'เริ่ม/เสร็จ',
     today: 'วันนี้',
     markItems: ['วันจันทร์', 'วันอังคาร', 'วันพุธ', 'วันพฤหัสบดี', 'วันศุกร์', 'วันเสาร์', 'วันอาทิตย์'],
     yearAndMonth: '${year}/${month}'

package/es/locales/tr-TR.d.ts

@@ -11,6 +11,7 @@ declare const trTR: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/vi-VN.d.ts

@@ -11,6 +11,7 @@ declare const viVN: {
         confirm: string;
         start: string;
         end: string;
+        startAndEnd: string;
         today: string;
         markItems: string[];
         yearAndMonth: string;

package/es/locales/vi-VN.js

@@ -14,6 +14,7 @@ const viVN = mergeLocale(base, {
     'confirm': 'Xác nhận',
     'start': 'Bắt đầu',
     'end': 'Kết thúc',
+    'startAndEnd': 'Bắt đầu/Kết thúc',
     'today': 'Hôm nay',
     'markItems': ['Một', 'Hai', 'Ba', 'Bốn', 'Năm', 'Sáu', 'Ngày'],
     'yearAndMonth': 'Tháng ${month} năm ${year}'