rn-grid-date-time-picker 1.3.0 → 1.3.1

package/lib/commonjs/components/field/fieldText.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.segmentErrorText = exports.placeholderText = exports.formatValueText = exports.formatValueParts = exports.formatTimeText = exports.formatRangeText = exports.formatMultipleText = exports.formatDateText = void 0;
+exports.splitPlaceholder = exports.segmentErrorText = exports.placeholderText = exports.placeholderParts = exports.formatValueText = exports.formatValueParts = exports.formatTimeText = exports.formatRangeText = exports.formatMultipleText = exports.formatDateText = exports.emptyFieldParts = void 0;
 var _segments = require("../../core/segments.js");
 var _defaultStrings = require("../theme/defaultStrings.js");
 const pad2 = n => String(n).padStart(2, '0');
@@ -58,20 +58,59 @@ const formatRangeText = (from, to, type, dateFormat, timeFormat, separator = '
 exports.formatRangeText = formatRangeText;
 const formatMultipleText = (values, type, dateFormat, timeFormat, dateText, periods = _defaultStrings.DEFAULT_STRINGS) => values.filter(v => !!v).map(v => formatValueText(v, type, dateFormat, timeFormat, dateText, periods)).join(', ');
 
-/** 'DD-MM-YYYY' or 'DD-MM-YYYY hh:mm AM', from the placeholder strings. */
+/** { date: 'DD-MM-YYYY', time: 'hh:mm AM' } (time '' unless datetime), from the placeholder strings. */
 exports.formatMultipleText = formatMultipleText;
-const placeholderText = (type, dateFormat, timeFormat, strings = _defaultStrings.DEFAULT_STRINGS) => {
+const placeholderParts = (type, dateFormat, timeFormat, strings = _defaultStrings.DEFAULT_STRINGS) => {
   const parts = {
     dd: strings.placeholderDay,
     MM: strings.placeholderMonth,
     yyyy: strings.placeholderYear
   };
   const date = dateFormat.replace(/yyyy|MM|dd/g, t => parts[t] ?? t);
-  if (type !== 'datetime') return date;
+  if (type !== 'datetime') return {
+    date,
+    time: ''
+  };
   const time = timeFormat === '24h' ? `${strings.placeholderHour24}:${strings.placeholderMinute}` : `${strings.placeholderHour}:${strings.placeholderMinute} ${strings.am}`;
-  return `${date}${strings.dateTimeSeparator ?? ' '}${time}`;
+  return {
+    date,
+    time
+  };
+};
+
+/** 'DD-MM-YYYY' or 'DD-MM-YYYY hh:mm AM', from the placeholder strings. */
+exports.placeholderParts = placeholderParts;
+const placeholderText = (type, dateFormat, timeFormat, strings = _defaultStrings.DEFAULT_STRINGS) => {
+  const {
+    date,
+    time
+  } = placeholderParts(type, dateFormat, timeFormat, strings);
+  return time ? `${date}${strings.dateTimeSeparator ?? ' '}${time}` : date;
 };
+
+/**
+ * A placeholder passed in, cut at the first date-time separator into the
+ * date and the time ('DD/MM/YYYY HH:MM' -> 'DD/MM/YYYY', 'HH:MM'). Text
+ * whose second part isn't a time (no ':'), like 'Pick a time', stays whole.
+ */
 exports.placeholderText = placeholderText;
+const splitPlaceholder = (text, separator) => {
+  const at = separator ? text.indexOf(separator) : -1;
+  const time = at > 0 ? text.slice(at + separator.length) : '';
+  if (!time.includes(':')) return {
+    date: text,
+    time: ''
+  };
+  return {
+    date: text.slice(0, at),
+    time
+  };
+};
+
+/** The empty field's placeholder (the one passed in, else the built one) as date and time. */
+exports.splitPlaceholder = splitPlaceholder;
+const emptyFieldParts = (placeholder, type, dateFormat, timeFormat, strings = _defaultStrings.DEFAULT_STRINGS) => placeholder ? splitPlaceholder(placeholder, strings.dateTimeSeparator ?? ' ') : placeholderParts(type, dateFormat, timeFormat, strings);
+exports.emptyFieldParts = emptyFieldParts;
 const TIME_KEYS = ['hour', 'minute', 'period'];
 
 /** The message shown below the field for the first typed-input problem. */

package/lib/commonjs/components/field/fieldText.js.map

@@ -1 +1 @@
-{"version":3,"names":["_segments","require","_defaultStrings","pad2","n","String","padStart","formatDateText","value","dateFormat","replace","date","year","month","day","exports","formatTimeText","timeFormat","periods","DEFAULT_STRINGS","time","hour","minute","hour12","period","to12Hour","am","pm","formatValueParts","type","dateText","formatValueText","dateTimeSeparator","formatRangeText","from","to","separator","a","b","trim","formatMultipleText","values","filter","v","map","join","placeholderText","strings","parts","dd","placeholderDay","MM","placeholderMonth","yyyy","placeholderYear","t","placeholderHour24","placeholderMinute","placeholderHour","TIME_KEYS","segmentErrorText","errors","yearRange","first","isTime","includes","key","code","errorIncompleteTime","errorIncomplete","errorInvalidTime","errorInvalidDate","errorYearOutOfRange"],"sourceRoot":"../../../../src","sources":["components/field/fieldText.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_segments","require","_defaultStrings","pad2","n","String","padStart","formatDateText","value","dateFormat","replace","date","year","month","day","exports","formatTimeText","timeFormat","periods","DEFAULT_STRINGS","time","hour","minute","hour12","period","to12Hour","am","pm","formatValueParts","type","dateText","formatValueText","dateTimeSeparator","formatRangeText","from","to","separator","a","b","trim","formatMultipleText","values","filter","v","map","join","placeholderParts","strings","parts","dd","placeholderDay","MM","placeholderMonth","yyyy","placeholderYear","t","placeholderHour24","placeholderMinute","placeholderHour","placeholderText","splitPlaceholder","text","at","indexOf","slice","length","includes","emptyFieldParts","placeholder","TIME_KEYS","segmentErrorText","errors","yearRange","first","isTime","key","code","errorIncompleteTime","errorIncomplete","errorInvalidTime","errorInvalidDate","errorYearOutOfRange"],"sourceRoot":"../../../../src","sources":["components/field/fieldText.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AAEA,IAAAC,eAAA,GAAAD,OAAA;AAEA,MAAME,IAAI,GAAIC,CAAS,IAAaC,MAAM,CAACD,CAAC,CAAC,CAACE,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;;AAE9D;AACO,MAAMC,cAAc,GAAGA,CAC5BC,KAAoB,EACpBC,UAAkB,KAElBA,UAAU,CACPC,OAAO,CAAC,MAAM,EAAEL,MAAM,CAACG,KAAK,CAACG,IAAI,CAACC,IAAI,CAAC,CAACN,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CACzDI,OAAO,CAAC,IAAI,EAAEP,IAAI,CAACK,KAAK,CAACG,IAAI,CAACE,KAAK,CAAC,CAAC,CACrCH,OAAO,CAAC,IAAI,EAAEP,IAAI,CAACK,KAAK,CAACG,IAAI,CAACG,GAAG,CAAC,CAAC;;AAExC;AAAAC,OAAA,CAAAR,cAAA,GAAAA,cAAA;AAMA;AACO,MAAMS,cAAc,GAAGA,CAC5BR,KAAoB,EACpBS,UAAsB,EACtBC,OAAqB,GAAGC,+BAAe,KAC5B;EACX,IAAI,CAACX,KAAK,CAACY,IAAI,EAAE,OAAO,EAAE;EAC1B,MAAM;IAAEC,IAAI;IAAEC;EAAO,CAAC,GAAGd,KAAK,CAACY,IAAI;EACnC,IAAIH,UAAU,KAAK,KAAK,EAAE,OAAO,GAAGd,IAAI,CAACkB,IAAI,CAAC,IAAIlB,IAAI,CAACmB,MAAM,CAAC,EAAE;EAChE,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAG,IAAAC,kBAAQ,EAACJ,IAAI,CAAC;EACzC,OAAO,GAAGlB,IAAI,CAACoB,MAAM,CAAC,IAAIpB,IAAI,CAACmB,MAAM,CAAC,IAAIE,MAAM,KAAK,IAAI,GAAGN,OAAO,CAACQ,EAAE,GAAGR,OAAO,CAACS,EAAE,EAAE;AACvF,CAAC;;AAED;AAAAZ,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAGA;AACO,MAAMY,gBAAgB,GAAGA,CAC9BpB,KAAoB,EACpBqB,IAAgB,EAChBpB,UAAkB,EAClBQ,UAAsB,EACtBa,QAA4B,EAC5BZ,OAAqB,GAAGC,+BAAe,MACH;EACpCR,IAAI,EAAEmB,QAAQ,GAAGA,QAAQ,CAACtB,KAAK,CAAC,GAAGD,cAAc,CAACC,KAAK,EAAEC,UAAU,CAAC;EACpEW,IAAI,EACFS,IAAI,KAAK,UAAU,IAAIrB,KAAK,CAACY,IAAI,GAC7BJ,cAAc,CAACR,KAAK,EAAES,UAAU,EAAEC,OAAO,CAAC,GAC1C;AACR,CAAC,CAAC;AAACH,OAAA,CAAAa,gBAAA,GAAAA,gBAAA;AAEI,MAAMG,eAAe,GAAGA,CAC7BvB,KAA2B,EAC3BqB,IAAgB,EAChBpB,UAAkB,EAClBQ,UAAsB,EACtBa,QAA4B,EAC5BZ,OAAqB,GAAGC,+BAAe,KAC5B;EACX,IAAI,CAACX,KAAK,EAAE,OAAO,EAAE;EACrB,MAAM;IAAEG,IAAI;IAAES;EAAK,CAAC,GAAGQ,gBAAgB,CACrCpB,KAAK,EACLqB,IAAI,EACJpB,UAAU,EACVQ,UAAU,EACVa,QAAQ,EACRZ,OACF,CAAC;EACD,OAAOE,IAAI,GAAG,GAAGT,IAAI,GAAGO,OAAO,CAACc,iBAAiB,IAAI,GAAG,GAAGZ,IAAI,EAAE,GAAGT,IAAI;AAC1E,CAAC;;AAED;AAAAI,OAAA,CAAAgB,eAAA,GAAAA,eAAA;AACO,MAAME,eAAe,GAAGA,CAC7BC,IAA0B,EAC1BC,EAAwB,EACxBN,IAAgB,EAChBpB,UAAkB,EAClBQ,UAAsB,EACtBmB,SAAiB,GAAG,KAAK,EACzBN,QAA4B,EAC5BZ,OAAqB,GAAGC,+BAAe,KAC5B;EACX,IAAI,CAACe,IAAI,IAAI,CAACC,EAAE,EAAE,OAAO,EAAE;EAC3B,MAAME,CAAC,GAAGN,eAAe,CACvBG,IAAI,EACJL,IAAI,EACJpB,UAAU,EACVQ,UAAU,EACVa,QAAQ,EACRZ,OACF,CAAC;EACD,MAAMoB,CAAC,GAAGP,eAAe,CACvBI,EAAE,EACFN,IAAI,EACJpB,UAAU,EACVQ,UAAU,EACVa,QAAQ,EACRZ,OACF,CAAC;EACD,OAAO,GAAGmB,CAAC,GAAGD,SAAS,GAAGE,CAAC,EAAE,CAACC,IAAI,CAAC,CAAC;AACtC,CAAC;;AAED;AAAAxB,OAAA,CAAAkB,eAAA,GAAAA,eAAA;AACO,MAAMO,kBAAkB,GAAGA,CAChCC,MAAgC,EAChCZ,IAAgB,EAChBpB,UAAkB,EAClBQ,UAAsB,EACtBa,QAA4B,EAC5BZ,OAAqB,GAAGC,+BAAe,KAEvCsB,MAAM,CACHC,MAAM,CAAEC,CAAC,IAAyB,CAAC,CAACA,CAAC,CAAC,CACtCC,GAAG,CAAED,CAAC,IACLZ,eAAe,CAACY,CAAC,EAAEd,IAAI,EAAEpB,UAAU,EAAEQ,UAAU,EAAEa,QAAQ,EAAEZ,OAAO,CACpE,CAAC,CACA2B,IAAI,CAAC,IAAI,CAAC;;AAEf;AAAA9B,OAAA,CAAAyB,kBAAA,GAAAA,kBAAA;AACO,MAAMM,gBAAgB,GAAGA,CAC9BjB,IAAgB,EAChBpB,UAAkB,EAClBQ,UAAsB,EACtB8B,OAAsB,GAAG5B,+BAAe,KACL;EACnC,MAAM6B,KAA6B,GAAG;IACpCC,EAAE,EAAEF,OAAO,CAACG,cAAc;IAC1BC,EAAE,EAAEJ,OAAO,CAACK,gBAAgB;IAC5BC,IAAI,EAAEN,OAAO,CAACO;EAChB,CAAC;EACD,MAAM3C,IAAI,GAAGF,UAAU,CAACC,OAAO,CAAC,aAAa,EAAG6C,CAAC,IAAKP,KAAK,CAACO,CAAC,CAAC,IAAIA,CAAC,CAAC;EACpE,IAAI1B,IAAI,KAAK,UAAU,EAAE,OAAO;IAAElB,IAAI;IAAES,IAAI,EAAE;EAAG,CAAC;EAClD,MAAMA,IAAI,GACRH,UAAU,KAAK,KAAK,GAChB,GAAG8B,OAAO,CAACS,iBAAiB,IAAIT,OAAO,CAACU,iBAAiB,EAAE,GAC3D,GAAGV,OAAO,CAACW,eAAe,IAAIX,OAAO,CAACU,iBAAiB,IAAIV,OAAO,CAACrB,EAAE,EAAE;EAC7E,OAAO;IAAEf,IAAI;IAAES;EAAK,CAAC;AACvB,CAAC;;AAED;AAAAL,OAAA,CAAA+B,gBAAA,GAAAA,gBAAA;AACO,MAAMa,eAAe,GAAGA,CAC7B9B,IAAgB,EAChBpB,UAAkB,EAClBQ,UAAsB,EACtB8B,OAAsB,GAAG5B,+BAAe,KAC7B;EACX,MAAM;IAAER,IAAI;IAAES;EAAK,CAAC,GAAG0B,gBAAgB,CACrCjB,IAAI,EACJpB,UAAU,EACVQ,UAAU,EACV8B,OACF,CAAC;EACD,OAAO3B,IAAI,GAAG,GAAGT,IAAI,GAAGoC,OAAO,CAACf,iBAAiB,IAAI,GAAG,GAAGZ,IAAI,EAAE,GAAGT,IAAI;AAC1E,CAAC;;AAED;AACA;AACA;AACA;AACA;AAJAI,OAAA,CAAA4C,eAAA,GAAAA,eAAA;AAKO,MAAMC,gBAAgB,GAAGA,CAC9BC,IAAY,EACZzB,SAAiB,KACkB;EACnC,MAAM0B,EAAE,GAAG1B,SAAS,GAAGyB,IAAI,CAACE,OAAO,CAAC3B,SAAS,CAAC,GAAG,CAAC,CAAC;EACnD,MAAMhB,IAAI,GAAG0C,EAAE,GAAG,CAAC,GAAGD,IAAI,CAACG,KAAK,CAACF,EAAE,GAAG1B,SAAS,CAAC6B,MAAM,CAAC,GAAG,EAAE;EAC5D,IAAI,CAAC7C,IAAI,CAAC8C,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO;IAAEvD,IAAI,EAAEkD,IAAI;IAAEzC,IAAI,EAAE;EAAG,CAAC;EACxD,OAAO;IAAET,IAAI,EAAEkD,IAAI,CAACG,KAAK,CAAC,CAAC,EAAEF,EAAE,CAAC;IAAE1C;EAAK,CAAC;AAC1C,CAAC;;AAED;AAAAL,OAAA,CAAA6C,gBAAA,GAAAA,gBAAA;AACO,MAAMO,eAAe,GAAGA,CAC7BC,WAA+B,EAC/BvC,IAAgB,EAChBpB,UAAkB,EAClBQ,UAAsB,EACtB8B,OAAsB,GAAG5B,+BAAe,KAExCiD,WAAW,GACPR,gBAAgB,CAACQ,WAAW,EAAErB,OAAO,CAACf,iBAAiB,IAAI,GAAG,CAAC,GAC/Dc,gBAAgB,CAACjB,IAAI,EAAEpB,UAAU,EAAEQ,UAAU,EAAE8B,OAAO,CAAC;AAAChC,OAAA,CAAAoD,eAAA,GAAAA,eAAA;AAE9D,MAAME,SAAS,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;;AAE9C;AACO,MAAMC,gBAAgB,GAAGA,CAC9BC,MAAsB,EACtBxB,OAAsB,EACtByB,SAA2C,KAChC;EACX,MAAMC,KAAK,GAAGF,MAAM,CAAC,CAAC,CAAC;EACvB,IAAI,CAACE,KAAK,EAAE,OAAO,EAAE;EACrB,MAAMC,MAAM,GAAGL,SAAS,CAACH,QAAQ,CAACO,KAAK,CAACE,GAAG,CAAC;EAC5C,QAAQF,KAAK,CAACG,IAAI;IAChB,KAAK,UAAU;MACb,OAAOF,MAAM,GAAG3B,OAAO,CAAC8B,mBAAmB,GAAG9B,OAAO,CAAC+B,eAAe;IACvE,KAAK,cAAc;MACjB,OAAOJ,MAAM,GAAG3B,OAAO,CAACgC,gBAAgB,GAAGhC,OAAO,CAACiC,gBAAgB;IACrE,KAAK,YAAY;MACf,OAAOR,SAAS,GACZzB,OAAO,CAACkC,mBAAmB,CAACT,SAAS,CAAC,GACtCzB,OAAO,CAACiC,gBAAgB;IAC9B;MACE,OAAOjC,OAAO,CAACiC,gBAAgB;EACnC;AACF,CAAC;AAACjE,OAAA,CAAAuD,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/components/theme/styleKeys.js

@@ -16,7 +16,9 @@ const STYLE_KEYS = exports.STYLE_KEYS = [
 'fieldTextDisabled',
 /**
  * Sets the date of a single date-time value apart from its time, e.g.
- * `{ minWidth: '50%' }` starts the time at the middle of the field.
+ * `{ minWidth: '50%' }` starts the time at the middle of the field. The empty
+ * field's placeholder does the same: a passed `placeholder` is cut at the
+ * first `strings.dateTimeSeparator` when what follows is a time ('HH:MM').
  */
 'fieldDateText', 'fieldPlaceholder', 'fieldSegment', 'fieldSegmentFocused', 'fieldSeparator', 'fieldPeriod', 'fieldPeriodSelected', 'fieldPeriodText', 'fieldIcon', 'clearIcon', 'label', 'mandatoryMark', 'helperText', 'instructionText', 'errorText', /** The `validate` message inside the picker (on top of `errorText`). */
 'validationText',

package/lib/commonjs/components/theme/styleKeys.js.map

@@ -1 +1 @@
-{"version":3,"names":["STYLE_KEYS","exports"],"sourceRoot":"../../../../src","sources":["components/theme/styleKeys.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACO,MAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;AACxB;AACA,WAAW,EACX,OAAO,EACP,eAAe,EACf,QAAQ,EACR,OAAO,EACP,aAAa,EACb,WAAW,EACX,MAAM,EACN,QAAQ,EACR,eAAe,EACf,aAAa;AACb;AACA,OAAO,EACP,cAAc,EACd,YAAY,EACZ,eAAe,EACf,WAAW,EACX;AACA,mBAAmB;AACnB;AACF;AACA;AACA;AACE,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,OAAO,EACP,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX;AACA,gBAAgB;AAChB;AACA,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,mBAAmB;AACnB;AACA,gBAAgB,EAChB,uBAAuB,EACvB,+BAA+B,EAC/B,oBAAoB,EACpB,4BAA4B,EAC5B;AACA,UAAU,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,qBAAqB;AACrB;AACA,YAAY,EACZ,aAAa;AACb;AACA,KAAK,EACL,SAAS,EACT,YAAY,EACZ,OAAO,EACP,WAAW,EACX,UAAU,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,UAAU,EACV,WAAW,EACX,SAAS,EACT,aAAa,EACb,UAAU,EACV,cAAc,EACd,SAAS,EACT,aAAa,EACb;AACA,aAAa;AACb;AACA,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd;AACA,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf;AACA,kBAAkB;AAClB;AACA,SAAS,EACT,WAAW,EACX;AACA,eAAe,EACf;AACA,eAAe,EACf,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAChB,OAAO,EACP,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB;AAChB;AACA,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,CACR;;AAMV","ignoreList":[]}
+{"version":3,"names":["STYLE_KEYS","exports"],"sourceRoot":"../../../../src","sources":["components/theme/styleKeys.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACO,MAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;AACxB;AACA,WAAW,EACX,OAAO,EACP,eAAe,EACf,QAAQ,EACR,OAAO,EACP,aAAa,EACb,WAAW,EACX,MAAM,EACN,QAAQ,EACR,eAAe,EACf,aAAa;AACb;AACA,OAAO,EACP,cAAc,EACd,YAAY,EACZ,eAAe,EACf,WAAW,EACX;AACA,mBAAmB;AACnB;AACF;AACA;AACA;AACA;AACA;AACE,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,OAAO,EACP,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX;AACA,gBAAgB;AAChB;AACA,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,mBAAmB;AACnB;AACA,gBAAgB,EAChB,uBAAuB,EACvB,+BAA+B,EAC/B,oBAAoB,EACpB,4BAA4B,EAC5B;AACA,UAAU,EACV,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,qBAAqB;AACrB;AACA,YAAY,EACZ,aAAa;AACb;AACA,KAAK,EACL,SAAS,EACT,YAAY,EACZ,OAAO,EACP,WAAW,EACX,UAAU,EACV,cAAc,EACd,YAAY,EACZ,aAAa,EACb,UAAU,EACV,WAAW,EACX,SAAS,EACT,aAAa,EACb,UAAU,EACV,cAAc,EACd,SAAS,EACT,aAAa,EACb;AACA,aAAa;AACb;AACA,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd;AACA,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf;AACA,kBAAkB;AAClB;AACA,SAAS,EACT,WAAW,EACX;AACA,eAAe,EACf;AACA,eAAe,EACf,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAChB,OAAO,EACP,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB;AAChB;AACA,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,CACR;;AAMV","ignoreList":[]}

package/lib/commonjs/components/types.js

@@ -31,7 +31,8 @@ exports.DEFAULT_YEAR_RANGE = void 0;
 
 /**
  * The second argument of `onChange` when the picker can show a Hijri calendar:
- * the calendar the date was picked in. The value itself is always Gregorian.
+ * the calendar the date was picked in, which is the tab on screen when it was
+ * saved. The value itself is always Gregorian.
  * The picker remembers it while mounted; to show a stored value back the same
  * way later, store this too and pass it as `dualDefaultTab` (dual) or
  * `calendarSystem`.

package/lib/commonjs/components/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["DEFAULT_YEAR_RANGE","exports","first","last"],"sourceRoot":"../../../src","sources":["components/types.ts"],"mappings":";;;;;;AAuBA;AACA;AACA;AACA;AACA;;AAEA;;AA0CA;;AAGA;AACA;AACA;AACA;AACA;AACA;;AAWA;;AAQA;;AAGA;;AAiDA;;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;;AAUA;;AAYA;;AAcA;;AAOA;;AA6QO,MAAMA,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG;EAAEE,KAAK,EAAE,IAAI;EAAEC,IAAI,EAAE;AAAK,CAAC","ignoreList":[]}
+{"version":3,"names":["DEFAULT_YEAR_RANGE","exports","first","last"],"sourceRoot":"../../../src","sources":["components/types.ts"],"mappings":";;;;;;AAuBA;AACA;AACA;AACA;AACA;;AAEA;;AA0CA;;AAGA;AACA;AACA;AACA;AACA;AACA;;AAWA;;AAQA;;AAGA;;AAwDA;;AAMA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKA;;AAUA;;AAYA;;AAcA;;AAOA;;AAkRO,MAAMA,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG;EAAEE,KAAK,EAAE,IAAI;EAAEC,IAAI,EAAE;AAAK,CAAC","ignoreList":[]}

package/lib/module/components/DateTimePicker.js

@@ -6,7 +6,7 @@ import { View } from 'react-native';
 import { resolveAdapter } from "../adapters/index.js";
 import { compareCalendarDates, daysBetween, isSameDay } from "../core/calendarDate.js";
 import { createConstraints } from "../core/constraints.js";
-import { clearDraft as emptied, createDraft, DEFAULT_TIME, draftToWire, sameDayRangeOk, setTime as applyTime, validateDraft } from "../core/draft.js";
+import { createDraft, DEFAULT_TIME, draftToWire, sameDayRangeOk, setTime as applyTime, validateDraft } from "../core/draft.js";
 import { hijriDateText, hijriPeriods, isHijriSupported, resolveCalendarSystem } from "../core/calendarSystem.js";
 import { defaultLocale, deriveDateFormat, deriveFirstDayOfWeek, deriveTimeFormat, normalizeDateFormat } from "../core/locale.js";
 import { arabicDigits, latinDigits, localeDigits } from "../core/numerals.js";
@@ -17,7 +17,6 @@ import CalendarSwitch from "./calendar/CalendarSwitch.js";
 import { localeNames } from "./calendar/localeNames.js";
 import { RtlContext } from "./theme/direction.js";
 import { NumeralsContext } from "./theme/numerals.js";
-import { firstSelectedDay } from "./calendar/selection.js";
 import PickerContainer from "./container/PickerContainer.js";
 import { formatDateText, formatMultipleText, formatRangeText, formatValueText } from "./field/fieldText.js";
 import FieldMessages from "./field/FieldMessages.js";
@@ -41,19 +40,6 @@ const RTL = {
   direction: 'rtl'
 };
 
-/** The same kind of selection with nothing in it. */
-const emptySelection = sel => sel.kind === 'single' ? {
-  kind: 'single',
-  day: null
-} : sel.kind === 'range' ? {
-  kind: 'range',
-  from: null,
-  to: null
-} : {
-  ...sel,
-  days: []
-};
-
 /** Minute steps that divide the hour. */
 const MINUTE_STEPS = [1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60];
 
@@ -570,10 +556,10 @@ const DateTimePicker = props => {
   };
   const valueKey = JSON.stringify(value ?? '');
 
-  // A selection belongs to the calendar it was picked in (Gregorian or Hijri):
-  // it shows only there, and the field writes it in that calendar. A saved
-  // value remembers its calendar; one from outside counts as picked in the
-  // calendar the picker opens on.
+  // A selection shows in both tabs (Gregorian and Hijri). It is saved with the
+  // calendar on screen, and the on-screen field writes it in that calendar. A
+  // saved value remembers its calendar; one from outside counts as picked in
+  // the calendar the picker opens on.
   // The saved value as a draft, for the on-screen field and for comparing
   // values by what they hold.
   const saved = useMemo(() => createDraft(mode, value, draftOptions),
@@ -584,32 +570,12 @@ const DateTimePicker = props => {
   const savedContent = contentOf(saved);
   const savedSystemRef = useRef(null);
   const savedSystem = savedSystemRef.current?.content === savedContent ? savedSystemRef.current.system : outsideSystem;
-  const [draftSystem, setDraftSystem] = useState(savedSystem);
-  // The draft is rebuilt on open and on a new value; so is its calendar. A new
-  // calendarSystem prop while the user is picking starts the selection over,
-  // since a selection is one calendar's.
-  const systemSeen = useRef({
-    isOpen,
-    valueKey,
-    savedSystem
-  });
-  useEffect(() => {
-    const seen = systemSeen.current;
-    systemSeen.current = {
-      isOpen,
-      valueKey,
-      savedSystem
-    };
-    setDraftSystem(savedSystem);
-    const systemOnly = seen.isOpen === isOpen && seen.valueKey === valueKey && seen.savedSystem !== savedSystem;
-    if (systemOnly && isOpen && edited.current) {
-      draft.clear();
-      resetSelectionUi();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- the draft's actions are stable
-  }, [isOpen, valueKey, savedSystem]);
-  useEffect(() => setDualTab(dualDefaultTab), [isOpen, dualDefaultTab]);
-  const selectionShown = draftSystem === shownSystem;
+  const hasSaved = valuesOf(saved).some(v => v !== null);
+  // Each open starts on the tab the saved value was saved with; with no value,
+  // on dualDefaultTab.
+  useEffect(() => setDualTab(hasSaved ? savedSystem : dualDefaultTab),
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- on open and on a new dualDefaultTab, not on every save
+  [isOpen, dualDefaultTab]);
   /** Saves a value: with the calendar it was picked in, when one can be Hijri. */
   const emitChange = useCallback((wire, picked) => {
     savedSystemRef.current = {
@@ -633,11 +599,12 @@ const DateTimePicker = props => {
     bounds: constraints.timeBounds(v.date)
   }) === null)) && !typingBlocked && !wheelSpinning && !confirmDisabled;
 
-  // Every save: Confirm, an 'instant' edit (onConfirm is added by `confirm`).
+  // Every save: Confirm, an 'instant' edit (onConfirm is added by `confirm`),
+  // with the calendar on screen.
   const commit = useCallback(wire => {
-    emitChange(wire, draftSystem);
+    emitChange(wire, shownSystem);
     onBlur?.();
-  }, [emitChange, draftSystem, onBlur]);
+  }, [emitChange, shownSystem, onBlur]);
   const confirm = useCallback(() => {
     if (!canConfirm) return;
     const {
@@ -669,8 +636,8 @@ const DateTimePicker = props => {
     draft.clear();
     resetSelectionUi();
     edited.current = false;
-    emitChange('', draftSystem);
-  }, [draft, emitChange, draftSystem, resetSelectionUi]);
+    emitChange('', shownSystem);
+  }, [draft, emitChange, shownSystem, resetSelectionUi]);
   const clearDraft = useCallback(() => {
     edited.current = true;
     draft.clear();
@@ -679,7 +646,6 @@ const DateTimePicker = props => {
 
   // × in the field above the calendar. 'instant' saves every edit, so it
   // clears the saved value too (once; an empty value isn't saved again).
-  const hasSaved = valuesOf(saved).some(v => v !== null);
   const clearInSheet = useCallback(() => {
     if (commitMode === 'instant' && hasSaved) clearValue();else clearDraft();
   }, [commitMode, hasSaved, clearValue, clearDraft]);
@@ -691,7 +657,8 @@ const DateTimePicker = props => {
   // Confirm press, but only while open (closing discards, as with Confirm),
   // and only what the draft holds: a time still being typed isn't saved yet.
   // An edit equal to the saved value isn't saved again; one `validate`
-  // rejected waits until the selection or the saved value changes.
+  // rejected waits until the selection or the saved value changes. A tab
+  // change the user makes saves the selection again with the new calendar.
   const lastRejected = useRef(null);
   // The last value saved: not saved again while the parent's `value` catches
   // up (a slow store, a server round trip) or when it never does.
@@ -709,11 +676,12 @@ const DateTimePicker = props => {
     if (!typingDone || timeIssue || !canSave(draft.draft)) return;
     const wire = draft.toWire();
     const key = JSON.stringify(wire);
-    if (key === lastRejected.current || key === lastEmitted.current) return;
-    // The same dates picked in the same calendar aren't saved again; the same
-    // dates picked in the other calendar are.
+    const sent = `${shownSystem} ${key}`;
+    if (key === lastRejected.current || sent === lastEmitted.current) return;
+    // The same dates in the same calendar aren't saved again; the same dates
+    // with the other tab on screen are.
     const unchanged = key === valueKey || contentOf(draft.draft) === savedContent;
-    if (unchanged && draftSystem === savedSystem) return;
+    if (unchanged && shownSystem === savedSystem) return;
     const message = latest.current.validate?.(wire);
     if (message) {
       lastRejected.current = key;
@@ -724,14 +692,14 @@ const DateTimePicker = props => {
       latest.current.onError?.('VALIDATION', wire);
       return;
     }
-    lastEmitted.current = key;
+    lastEmitted.current = sent;
     commit(wire);
   };
   // Only typing waits for the field to be left; a tap is a finished edit.
   const typedLast = useRef(false);
   useEffect(() => saveInstant(!sheetTyping || !typedLast.current),
   // eslint-disable-next-line react-hooks/exhaustive-deps -- when the draft or what blocks it changes, not when callbacks are re-created
-  [commitMode, isOpen, sheetTyping, draft.draft, draftSystem, timeIssue, typingBlocked, wheelSpinning, confirmDisabled, constraints]);
+  [commitMode, isOpen, sheetTyping, draft.draft, shownSystem, timeIssue, typingBlocked, wheelSpinning, confirmDisabled, constraints]);
   // Closing while the sheet's field still has focus ends the typing: an
   // instant picker saves what was typed before it closes.
   const saveInstantRef = useRef(saveInstant);
@@ -747,16 +715,9 @@ const DateTimePicker = props => {
     date: parsed.dateOnly,
     time: fixedTime ?? pending[key] ?? newTime()
   } : null);
-
-  // Typed segments are Gregorian, so typing keeps the calendar a selection was
-  // picked in; into an empty draft, it takes the calendar on screen.
-  const adoptShownIfEmpty = () => {
-    if (valuesOf(d).every(v => v === null)) setDraftSystem(shownSystem);
-  };
   const onSheetTyped = parsed => {
     edited.current = true;
     typedLast.current = true;
-    adoptShownIfEmpty();
     const typed = withFilledTime(parsed, 'single');
     setTypingBlock('single', !parsed.isEmpty && !typed);
     if (typed) draft.setValue(typed, 'single');else if (parsed.isEmpty) draft.clear();
@@ -764,7 +725,6 @@ const DateTimePicker = props => {
   const onRangeTyped = (end, parsed) => {
     edited.current = true;
     typedLast.current = true;
-    adoptShownIfEmpty();
     const typed = withFilledTime(parsed, end);
     setTypingBlock(end, !parsed.isEmpty && !typed);
     if (typed || parsed.isEmpty) draft.setValue(typed, end);
@@ -810,56 +770,45 @@ const DateTimePicker = props => {
   const onSelectDay = useCallback(day => {
     edited.current = true;
     typedLast.current = false;
-    // A pick in the other calendar starts over: the selection is one calendar's.
-    const fresh = draftSystem !== shownSystem && valuesOf(d).some(v => v !== null);
-    setDraftSystem(shownSystem);
-    const cur = fresh ? emptied(d) : d;
-    const end0 = fresh ? 'from' : activeEnd;
-    const dayInEdit = fresh ? null : activeDay;
-    const times = fresh ? {} : pending;
-    if (fresh) {
-      draft.clear();
-      resetSelectionUi();
-    }
     // A multiple picker scrolls for its first date only, so more can be picked.
-    if (cur.mode !== 'multiple' || cur.slots.length === 0) revealTime();
-    if (cur.mode === 'range') {
+    if (d.mode !== 'multiple' || d.slots.length === 0) revealTime();
+    if (d.mode === 'range') {
       if (rangeLayout === 'fromTo') {
         setEndPicked(false);
         // A full range: the tap starts a new one (or moves the nearest end).
-        if (!endPicked && cur.from.value && cur.to.value) {
+        if (!endPicked && d.from.value && d.to.value) {
           const moveNearest = range?.reselect === 'moveNearestEnd';
-          const nearest = Math.abs(daysBetween(cur.from.value.date, day)) < Math.abs(daysBetween(cur.to.value.date, day)) ? 'from' : 'to';
+          const nearest = Math.abs(daysBetween(d.from.value.date, day)) < Math.abs(daysBetween(d.to.value.date, day)) ? 'from' : 'to';
           const end = moveNearest ? nearest : 'from';
           setTypingBlock('from', false);
           setTypingBlock('to', false);
-          draft.selectDay(day, fixedTime ?? times[end] ?? newTime());
+          draft.selectDay(day, fixedTime ?? pending[end] ?? newTime());
           setActiveEnd(moveNearest ? nearest : 'to');
           return;
         }
         // Choosing the end after a start tap: a day before the start moves the start.
-        const end1 = end0 === 'to' && !endPicked && cur.from.value && compareCalendarDates(day, cur.from.value.date) < 0 ? 'from' : end0;
+        const end1 = activeEnd === 'to' && !endPicked && d.from.value && compareCalendarDates(day, d.from.value.date) < 0 ? 'from' : activeEnd;
         // The tapped day replaces whatever was typed in this end only.
         setTypingBlock(end1, false);
-        draft.setRangeEnd(day, end1, end1 === 'to' ? endTimeFor(cur.from.value, day, times.to) : fixedTime ?? times.from ?? newTime());
+        draft.setRangeEnd(day, end1, end1 === 'to' ? endTimeFor(d.from.value, day, pending.to) : fixedTime ?? pending.from ?? newTime());
         // The start tapped again where a range can't be one day deselects
         // it, so the next tap picks the start again.
-        const deselects = end1 === 'to' && !sameDayRangeOk(draftOptions) && isSameDay(cur.from.value?.date, day);
-        if (end0 === 'from') setActiveEnd('to');else if (deselects) setActiveEnd('from');
+        const deselects = end1 === 'to' && !sameDayRangeOk(draftOptions) && isSameDay(d.from.value?.date, day);
+        if (activeEnd === 'from') setActiveEnd('to');else if (deselects) setActiveEnd('from');
         return;
       }
       // The single field: the first tap is the start, the next one the end.
-      const startsOver = !cur.from.value || !!cur.to.value && range?.reselect !== 'moveNearestEnd';
+      const startsOver = !d.from.value || !!d.to.value && range?.reselect !== 'moveNearestEnd';
       const end = startsOver ? 'from' : 'to';
       setTypingBlock('single', false);
-      draft.selectDay(day, end === 'to' && !cur.to.value ? endTimeFor(cur.from.value, day, times.to) : fixedTime ?? times[end] ?? newTime());
+      draft.selectDay(day, end === 'to' && !d.to.value ? endTimeFor(d.from.value, day, pending.to) : fixedTime ?? pending[end] ?? newTime());
       return;
     }
-    if (cur.mode === 'multiple') {
+    if (d.mode === 'multiple') {
       const perDate = type === 'datetime' && multipleTimeMode === 'perDate';
-      const picked = cur.slots.some(slot => isSameDay(slot.value?.date, day));
+      const picked = d.slots.some(slot => isSameDay(slot.value?.date, day));
       // perDate: a tap on a picked day first makes it the one the time row edits.
-      if (perDate && picked && !isSameDay(dayInEdit, day)) {
+      if (perDate && picked && !isSameDay(activeDay, day)) {
         setActiveDay(day);
         return;
       }
@@ -868,10 +817,10 @@ const DateTimePicker = props => {
       return;
     }
     setTypingBlock('single', false);
-    draft.selectDay(day, fixedTime ?? times.single ?? newTime());
+    draft.selectDay(day, fixedTime ?? pending.single ?? newTime());
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps -- valuesOf reads only `d` and props listed here
-  [d, draft, newTime, rangeLayout, activeEnd, activeDay, fixedTime, pending, range?.reselect, type, multipleTimeMode, setTypingBlock, draftSystem, shownSystem, resetSelectionUi, endPicked, draftOptions, minuteStep, constraints, revealTime]);
+  [d, draft, newTime, rangeLayout, activeEnd, activeDay, fixedTime, pending, range?.reselect, type, multipleTimeMode, setTypingBlock, endPicked, draftOptions, minuteStep, constraints, revealTime]);
 
   // The calendar gets a tap handler that never changes, so its memoized day
   // cells don't all redraw on every tap; it calls the current one.
@@ -994,11 +943,10 @@ const DateTimePicker = props => {
   // The calendar the on-screen field writes the saved value in.
   const fieldSystem = fieldCalendar === 'gregory' ? 'gregory' : savedSystem;
   const savedDateText = dateTextFor(fieldSystem);
-  const draftDateText = dateTextFor(draftSystem);
+  const draftDateText = dateTextFor(shownSystem);
   const savedStrings = stringsFor(fieldSystem);
-  const draftStrings = stringsFor(draftSystem);
-  // Error messages inside the picker follow the tab on screen; the on-screen
-  // field's keep `strings`.
+  // The texts inside the picker, its error messages too, follow the tab on
+  // screen; the on-screen field's keep `strings`.
   const shownStrings = stringsFor(shownSystem);
 
   // What the on-screen field shows: the saved value, never the draft.
@@ -1050,11 +998,12 @@ const DateTimePicker = props => {
   };
   const sheetValue = draft.draft.mode === 'single' ? draft.draft.slot.value : null;
   // A time outside the limits is explained under the time row, not here.
-  const sheetValueError = sheetValue && dayOff(sheetValue.date) ? shownStrings.errorNotAllowed : '';
+  const notAllowedError = sheetOptions?.showNotAllowedError === false ? '' : shownStrings.errorNotAllowed;
+  const sheetValueError = sheetValue && dayOff(sheetValue.date) ? notAllowedError : '';
   let rangeError = '';
   if (d.mode === 'range' && d.from.value && d.to.value) {
     const length = daysBetween(d.from.value.date, d.to.value.date) + 1;
-    if (constraints.dayStatus(d.from.value.date).disabled || constraints.dayStatus(d.to.value.date).disabled) rangeError = shownStrings.errorNotAllowed;else if (previewIssue === 'RANGE_ORDER') rangeError = shownStrings.errorRangeOrder;else if (previewIssue === 'RANGE_LENGTH') rangeError = range?.minDays !== undefined && length < range.minDays ? shownStrings.errorRangeTooShort(range.minDays) : shownStrings.errorRangeTooLong(range?.maxDays ?? length);
+    if (constraints.dayStatus(d.from.value.date).disabled || constraints.dayStatus(d.to.value.date).disabled) rangeError = notAllowedError;else if (previewIssue === 'RANGE_ORDER') rangeError = shownStrings.errorRangeOrder;else if (previewIssue === 'RANGE_LENGTH') rangeError = range?.minDays !== undefined && length < range.minDays ? shownStrings.errorRangeTooShort(range.minDays) : shownStrings.errorRangeTooLong(range?.maxDays ?? length);
   }
   const fieldCommon = {
     type,
@@ -1104,7 +1053,7 @@ const DateTimePicker = props => {
     testID: testID ? `${testID}-value` : undefined
   }) : mode === 'single' ? /*#__PURE__*/_jsx(ValueField, {
     ...fieldCommon,
-    strings: draftStrings,
+    strings: shownStrings,
     errorStrings: shownStrings,
     value: sheetValue,
     displayText: precision !== 'day' ? periodText(sheetValue) : undefined,
@@ -1121,7 +1070,7 @@ const DateTimePicker = props => {
     testID: testID ? `${testID}-value` : undefined
   }) : d.mode === 'range' ? /*#__PURE__*/_jsx(RangeFields, {
     ...fieldCommon,
-    strings: draftStrings,
+    strings: shownStrings,
     errorStrings: shownStrings,
     layout: rangeLayout,
     dateText: draftDateText,
@@ -1141,9 +1090,9 @@ const DateTimePicker = props => {
     testID: testID
   }) : d.mode === 'multiple' ? /*#__PURE__*/_jsx(ValueField, {
     ...fieldCommon,
-    strings: draftStrings,
+    strings: shownStrings,
     value: null,
-    displayText: formatMultipleText(draftValues, type, dateFormat, timeFormat, draftDateText, draftStrings),
+    displayText: formatMultipleText(draftValues, type, dateFormat, timeFormat, draftDateText, shownStrings),
     placeholder: sheetOptions?.fieldPlaceholder,
     allowClear: allowClear,
     onClear: clearInSheet,
@@ -1158,13 +1107,20 @@ const DateTimePicker = props => {
     dual: strings.calendarDual ?? DEFAULT_STRINGS.calendarDual
   };
   const systemA11yLabel = strings.a11yCalendarSystem ?? DEFAULT_STRINGS.a11yCalendarSystem;
+  // A calendar or tab the user picks is an edit: 'instant' saves the selection
+  // again with that calendar.
   const chooseSystem = next => {
     if (next === system) return;
+    edited.current = true;
     setChosenSystem(next);
     if (next === 'dual') setDualTab(dualDefaultTab);
     echo.current = next;
     onCalendarSystemChange?.(next);
   };
+  const chooseTab = next => {
+    edited.current = true;
+    setDualTab(next);
+  };
   const calendarSwitchNode = !switchSystems ? null : renderCalendarSwitch ? renderCalendarSwitch({
     systems: switchSystems,
     selected: system,
@@ -1196,7 +1152,7 @@ const DateTimePicker = props => {
       label: systemLabels.hijri
     }],
     selected: dualTab,
-    onSelect: setDualTab,
+    onSelect: chooseTab,
     accessibilityLabel: systemA11yLabel,
     tokens: tokens,
     styles: styles,
@@ -1212,16 +1168,16 @@ const DateTimePicker = props => {
       children: node
     })
   });
-  // Another calendar opens on the days the last one showed, else on the
-  // selection (shown or not), else where the picker would open.
-  const calendarAnchor = shownAnchor.current ?? (selectionShown ? null : firstSelectedDay(selection)) ?? initialVisibleDate;
+  // Another calendar opens on the days the last one showed, else where the
+  // picker would open.
+  const calendarAnchor = shownAnchor.current ?? initialVisibleDate;
   const calendar = /*#__PURE__*/_jsxs(View, {
     style: folded ? FOLDED : undefined,
     children: [calendarSwitchNode, dualTabs, mirrored(/*#__PURE__*/_jsx(Calendar, {
-      constraints: selectionShown ? calendarConstraints : constraints,
+      constraints: calendarConstraints,
       today: today,
       initialVisibleDate: calendarAnchor,
-      selection: selectionShown ? selection : emptySelection(selection),
+      selection: selection,
       onSelectDay: onSelectDayStable,
       firstDayOfWeek: firstDayOfWeek,
       showOutsideDays: showOutsideDays,
@@ -1284,15 +1240,11 @@ const DateTimePicker = props => {
   // Shown while the selection is still the one it was given for.
   const validationMessage = validation && (validation.key === JSON.stringify(draft.toWire()) || validation.key === JSON.stringify(draftToWire(preview, draftOptions))) ? validation.message : null;
 
-  // The field writes the date in the digits of the calendar it was picked in;
-  // the calendar and the time rows follow the tab that shows.
+  // The field, the calendar and the time rows follow the tab that shows.
   const sheetContent = /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(NumeralsContext.Provider, {
-      value: digitsFor(draftSystem),
-      children: sheetField
-    }), /*#__PURE__*/_jsx(NumeralsContext.Provider, {
+    children: [/*#__PURE__*/_jsxs(NumeralsContext.Provider, {
       value: digitsFor(shownSystem),
-      children: calendar
+      children: [sheetField, calendar]
     }), timeRow == null ? null :
     /*#__PURE__*/
     // Measured for the scroll to the time (sheet.scrollToTime).