@navikt/ds-react 7.35.2 → 7.36.0

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.
@@ -61,7 +61,7 @@ const DateDialog = ({ open, children, onClose, anchor, locale, translate, varian
61
61
  if (hideModal) {
62
62
  return (react_1.default.createElement(popover_1.Popover, Object.assign({ arrow: false, anchorEl: anchor, open: open, onClose: onClose, placement: "bottom-start", role: "dialog", className: cn("navds-date__popover", {
63
63
  "navds-date": variant === "month",
64
- }), flip: false }, popoverProps), children));
64
+ }) }, popoverProps), children));
65
65
  }
66
66
  return (react_1.default.createElement(modal_1.Modal, { ref: modalRef, open: open, onClose: (event) => {
67
67
  event.stopPropagation();
@@ -1 +1 @@
1
- {"version":3,"file":"Date.Dialog.js","sourceRoot":"","sources":["../../src/date/Date.Dialog.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAsC;AACtC,sCAAmC;AACnC,oCAAiC;AACjC,0DAAyD;AACzD,wCAAqC;AACrC,0CAA8C;AAC9C,yCAAyC;AACzC,wDAAkD;AAElD,+CAAsD;AAEtD,MAAM,cAAc,GAAG;IACrB,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,aAAa;IACvB,KAAK,EAAE,iBAAiB;IACxB,KAAK,EAAE,aAAa;CACZ,CAAC;AAiBX,MAAM,UAAU,GAAG,CAAC,EAClB,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,MAAM,EACN,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,GACK,EAAE,EAAE;IACrB,MAAM,eAAe,GAAG,IAAA,oBAAO,EAAC,QAAQ,EAAE,IAAA,mCAAqB,EAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,oBAAY,GAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAoB,IAAI,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,IAAA,+BAAe,EAAC,KAAK,CAAC,KAAK,SAAS,CAAC;IACvD,MAAM,SAAS,GACb,IAAA,gBAAQ,EAAC,+BAA+B,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAEhE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,8BAAC,iBAAO,kBACN,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAC,cAAc,EACxB,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,EAAE,CAAC,qBAAqB,EAAE;gBACnC,YAAY,EAAE,OAAO,KAAK,OAAO;aAClC,CAAC,EACF,IAAI,EAAE,KAAK,IACP,YAAY,GAEf,QAAQ,CACD,CACX,CAAC;IACJ,CAAC;IAED,OAAO,CACL,8BAAC,aAAK,IACJ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC,gBACW,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAC9C,SAAS,EAAE,EAAE,CAAC,mBAAmB,EAAE;YACjC,0BAA0B,EAAE,SAAS;YACrC,YAAY,EAAE,OAAO,KAAK,OAAO;SAClC,CAAC,EACF,oBAAoB,QACpB,SAAS,EAAC,KAAK;QAEf,uCAAK,SAAS,EAAE,EAAE,CAAC,wBAAwB,CAAC;YACzC,QAAQ;YACT,8BAAC,eAAM,IACL,OAAO,EAAC,UAAU,EAClB,OAAO,EAAE,GAAG,EAAE,WAAC,OAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA,EAAA,EACzC,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,IAEZ,eAAe,CAAC,OAAO,CAAC,CAClB,CACL,CACA,CACT,CAAC;AACJ,CAAC,CAAC;AACO,gCAAU"}
1
+ {"version":3,"file":"Date.Dialog.js","sourceRoot":"","sources":["../../src/date/Date.Dialog.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAsC;AACtC,sCAAmC;AACnC,oCAAiC;AACjC,0DAAyD;AACzD,wCAAqC;AACrC,0CAA8C;AAC9C,yCAAyC;AACzC,wDAAkD;AAElD,+CAAsD;AAEtD,MAAM,cAAc,GAAG;IACrB,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,aAAa;IACvB,KAAK,EAAE,iBAAiB;IACxB,KAAK,EAAE,aAAa;CACZ,CAAC;AAiBX,MAAM,UAAU,GAAG,CAAC,EAClB,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,MAAM,EACN,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,GACK,EAAE,EAAE;IACrB,MAAM,eAAe,GAAG,IAAA,oBAAO,EAAC,QAAQ,EAAE,IAAA,mCAAqB,EAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,oBAAY,GAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAoB,IAAI,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,IAAA,+BAAe,EAAC,KAAK,CAAC,KAAK,SAAS,CAAC;IACvD,MAAM,SAAS,GACb,IAAA,gBAAQ,EAAC,+BAA+B,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAEhE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,8BAAC,iBAAO,kBACN,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAC,cAAc,EACxB,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,EAAE,CAAC,qBAAqB,EAAE;gBACnC,YAAY,EAAE,OAAO,KAAK,OAAO;aAClC,CAAC,IACE,YAAY,GAEf,QAAQ,CACD,CACX,CAAC;IACJ,CAAC;IAED,OAAO,CACL,8BAAC,aAAK,IACJ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC,gBACW,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAC9C,SAAS,EAAE,EAAE,CAAC,mBAAmB,EAAE;YACjC,0BAA0B,EAAE,SAAS;YACrC,YAAY,EAAE,OAAO,KAAK,OAAO;SAClC,CAAC,EACF,oBAAoB,QACpB,SAAS,EAAC,KAAK;QAEf,uCAAK,SAAS,EAAE,EAAE,CAAC,wBAAwB,CAAC;YACzC,QAAQ;YACT,8BAAC,eAAM,IACL,OAAO,EAAC,UAAU,EAClB,OAAO,EAAE,GAAG,EAAE,WAAC,OAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA,EAAA,EACzC,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,IAEZ,eAAe,CAAC,OAAO,CAAC,CAClB,CACL,CACA,CACT,CAAC;AACJ,CAAC,CAAC;AACO,gCAAU"}
@@ -89,15 +89,25 @@ const ReactDayPicker = (_a) => {
89
89
  /**
90
90
  * In the case where we have:
91
91
  * - Mode: "range"
92
- * - selected: { from: undefined, to: Date }
92
+ * - selected: { from: undefined, to: Date } or
93
+ * - selected: { from: Date, to: undefined }
93
94
  *
94
- * RDP returns undefined for newSelection. We need to manually handle this case.
95
+ *
96
+ * RDP returns undefined for newSelection. We need to manually handle these cases.
95
97
  */
96
98
  if (mode !== "range" || newSelection || !(0, Date_typeutils_1.isDateRange)(selected)) {
97
99
  handleSelect(newSelection);
98
100
  return;
99
101
  }
100
102
  if (!selected.to) {
103
+ /**
104
+ * If defaultSelected.from is defined, but not "to", and user selects the same date as "from",
105
+ * we interpret this as user wanting to select a single date range (from === to).
106
+ */
107
+ if (selected.from && (0, date_fns_1.isSameDay)(selected.from, newDate)) {
108
+ handleSelect({ from: newDate, to: newDate });
109
+ return;
110
+ }
101
111
  handleSelect({ from: newDate, to: undefined });
102
112
  return;
103
113
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":"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"}
@@ -3,11 +3,11 @@ export interface InternalHeaderUserProps extends HTMLAttributes<HTMLDivElement>
3
3
  /**
4
4
  * User name
5
5
  */
6
- name: string;
6
+ name: React.ReactNode;
7
7
  /**
8
8
  * User description
9
9
  */
10
- description?: string;
10
+ description?: React.ReactNode;
11
11
  }
12
12
  export declare const InternalHeaderUser: React.ForwardRefExoticComponent<InternalHeaderUserProps & React.RefAttributes<HTMLDivElement>>;
13
13
  export default InternalHeaderUser;
@@ -52,7 +52,7 @@ exports.InternalHeaderUser = (0, react_1.forwardRef)((_a, ref) => {
52
52
  var { className, name, description } = _a, rest = __rest(_a, ["className", "name", "description"]);
53
53
  const { cn } = (0, Theme_1.useRenameCSS)();
54
54
  return (react_1.default.createElement("div", Object.assign({}, rest, { ref: ref, className: cn("navds-internalheader__user", className) }),
55
- react_1.default.createElement("span", null,
55
+ react_1.default.createElement("div", null,
56
56
  react_1.default.createElement(typography_1.BodyShort, { size: "small", as: "div" }, name),
57
57
  description && react_1.default.createElement(typography_1.Detail, { as: "div" }, description))));
58
58
  });
@@ -1 +1 @@
1
- {"version":3,"file":"InternalHeaderUser.js","sourceRoot":"","sources":["../../src/internal-header/InternalHeaderUser.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA0D;AAC1D,0CAA8C;AAC9C,8CAAkD;AAcrC,QAAA,kBAAkB,GAAG,IAAA,kBAAU,EAG1C,CAAC,EAAyC,EAAE,GAAG,EAAE,EAAE;QAAlD,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,OAAW,EAAN,IAAI,cAAvC,oCAAyC,CAAF;IACxC,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,oBAAY,GAAE,CAAC;IAE9B,OAAO,CACL,uDACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,4BAA4B,EAAE,SAAS,CAAC;QAEtD;YACE,8BAAC,sBAAS,IAAC,IAAI,EAAC,OAAO,EAAC,EAAE,EAAC,KAAK,IAC7B,IAAI,CACK;YACX,WAAW,IAAI,8BAAC,mBAAM,IAAC,EAAE,EAAC,KAAK,IAAE,WAAW,CAAU,CAClD,CACH,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,kBAAe,0BAAkB,CAAC"}
1
+ {"version":3,"file":"InternalHeaderUser.js","sourceRoot":"","sources":["../../src/internal-header/InternalHeaderUser.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA0D;AAC1D,0CAA8C;AAC9C,8CAAkD;AAcrC,QAAA,kBAAkB,GAAG,IAAA,kBAAU,EAG1C,CAAC,EAAyC,EAAE,GAAG,EAAE,EAAE;QAAlD,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,OAAW,EAAN,IAAI,cAAvC,oCAAyC,CAAF;IACxC,MAAM,EAAE,EAAE,EAAE,GAAG,IAAA,oBAAY,GAAE,CAAC;IAE9B,OAAO,CACL,uDACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,4BAA4B,EAAE,SAAS,CAAC;QAEtD;YACE,8BAAC,sBAAS,IAAC,IAAI,EAAC,OAAO,EAAC,EAAE,EAAC,KAAK,IAC7B,IAAI,CACK;YACX,WAAW,IAAI,8BAAC,mBAAM,IAAC,EAAE,EAAC,KAAK,IAAE,WAAW,CAAU,CACnD,CACF,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,kBAAe,0BAAkB,CAAC"}
@@ -50,7 +50,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
50
50
  exports.Popover = void 0;
51
51
  const react_1 = require("@floating-ui/react");
52
52
  const react_2 = __importStar(require("react"));
53
- const Date_Input_1 = require("../date/Date.Input");
54
53
  const Modal_context_1 = require("../modal/Modal.context");
55
54
  const DismissableLayer_1 = require("../overlays/dismissablelayer/DismissableLayer");
56
55
  const Theme_1 = require("../theme/Theme");
@@ -82,9 +81,7 @@ exports.Popover = (0, react_2.forwardRef)((_a, ref) => {
82
81
  const { cn } = (0, Theme_1.useRenameCSS)();
83
82
  const arrowRef = (0, react_2.useRef)(null);
84
83
  const isInModal = (0, Modal_context_1.useModalContext)(false) !== undefined;
85
- const datepickerContext = (0, Date_Input_1.useDateInputContext)(false);
86
84
  const chosenStrategy = userStrategy !== null && userStrategy !== void 0 ? userStrategy : (isInModal ? "fixed" : "absolute");
87
- const chosenFlip = datepickerContext ? false : _flip;
88
85
  const themeContext = (0, Theme_1.useThemeInternal)(false);
89
86
  const { update, refs, placement: flPlacement, middlewareData: { arrow: { x: arrowX, y: arrowY } = {} }, floatingStyles, } = (0, react_1.useFloating)({
90
87
  strategy: chosenStrategy,
@@ -92,8 +89,11 @@ exports.Popover = (0, react_2.forwardRef)((_a, ref) => {
92
89
  open,
93
90
  middleware: [
94
91
  (0, react_1.offset)(offset !== null && offset !== void 0 ? offset : ((themeContext === null || themeContext === void 0 ? void 0 : themeContext.isDarkside) ? 8 : arrow ? 16 : 4)),
95
- chosenFlip &&
96
- (0, react_1.flip)({ padding: 5, fallbackPlacements: ["bottom", "top"] }),
92
+ _flip &&
93
+ (0, react_1.flip)({
94
+ padding: 5,
95
+ fallbackPlacements: getOppositePlacement(placement),
96
+ }),
97
97
  (0, react_1.shift)({ padding: 12 }),
98
98
  (0, react_1.arrow)({ element: arrowRef, padding: 8 }),
99
99
  ],
@@ -125,6 +125,28 @@ exports.Popover = (0, react_2.forwardRef)((_a, ref) => {
125
125
  arrowRef.current = node;
126
126
  }, style: Object.assign(Object.assign(Object.assign({}, (arrowX != null ? { left: arrowX } : {})), (arrowY != null ? { top: arrowY } : {})), (staticSide ? { [staticSide]: "-0.5rem" } : {})), className: cn("navds-popover__arrow") })))));
127
127
  });
128
+ const oppositeSideMap = {
129
+ top: "bottom",
130
+ bottom: "top",
131
+ left: "right",
132
+ right: "left",
133
+ };
134
+ /**
135
+ * If placement is side+alignment, we want to preserve the alignment
136
+ * when flipping to the opposite side.
137
+ */
138
+ function getOppositePlacement(placement) {
139
+ /**
140
+ * In most cases, the fallback for left/right should be top/bottom
141
+ * as there is usually more space vertically than horizontally.
142
+ */
143
+ if (placement.startsWith("left") || placement.startsWith("right")) {
144
+ return ["bottom", "top"];
145
+ }
146
+ const [side, alignment] = placement.split("-");
147
+ const oppositeSide = oppositeSideMap[side];
148
+ return [alignment ? `${oppositeSide}-${alignment}` : oppositeSide];
149
+ }
128
150
  exports.Popover.Content = PopoverContent_1.default;
129
151
  exports.default = exports.Popover;
130
152
  //# sourceMappingURL=Popover.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Popover.js","sourceRoot":"","sources":["../../src/popover/Popover.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Popover.js","sourceRoot":"","sources":["../../src/popover/Popover.tsx"],"names":[],"mappings":"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"}
@@ -25,7 +25,7 @@ const DateDialog = ({ open, children, onClose, anchor, locale, translate, varian
25
25
  if (hideModal) {
26
26
  return (React.createElement(Popover, Object.assign({ arrow: false, anchorEl: anchor, open: open, onClose: onClose, placement: "bottom-start", role: "dialog", className: cn("navds-date__popover", {
27
27
  "navds-date": variant === "month",
28
- }), flip: false }, popoverProps), children));
28
+ }) }, popoverProps), children));
29
29
  }
30
30
  return (React.createElement(Modal, { ref: modalRef, open: open, onClose: (event) => {
31
31
  event.stopPropagation();
@@ -1 +1 @@
1
- {"version":3,"file":"Date.Dialog.js","sourceRoot":"","sources":["../../src/date/Date.Dialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,cAAc,GAAG;IACrB,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,aAAa;IACvB,KAAK,EAAE,iBAAiB;IACxB,KAAK,EAAE,aAAa;CACZ,CAAC;AAiBX,MAAM,UAAU,GAAG,CAAC,EAClB,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,MAAM,EACN,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,GACK,EAAE,EAAE;IACrB,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;IACvD,MAAM,SAAS,GACb,QAAQ,CAAC,+BAA+B,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAEhE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,oBAAC,OAAO,kBACN,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAC,cAAc,EACxB,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,EAAE,CAAC,qBAAqB,EAAE;gBACnC,YAAY,EAAE,OAAO,KAAK,OAAO;aAClC,CAAC,EACF,IAAI,EAAE,KAAK,IACP,YAAY,GAEf,QAAQ,CACD,CACX,CAAC;IACJ,CAAC;IAED,OAAO,CACL,oBAAC,KAAK,IACJ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC,gBACW,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAC9C,SAAS,EAAE,EAAE,CAAC,mBAAmB,EAAE;YACjC,0BAA0B,EAAE,SAAS;YACrC,YAAY,EAAE,OAAO,KAAK,OAAO;SAClC,CAAC,EACF,oBAAoB,QACpB,SAAS,EAAC,KAAK;QAEf,6BAAK,SAAS,EAAE,EAAE,CAAC,wBAAwB,CAAC;YACzC,QAAQ;YACT,oBAAC,MAAM,IACL,OAAO,EAAC,UAAU,EAClB,OAAO,EAAE,GAAG,EAAE,WAAC,OAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA,EAAA,EACzC,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,IAEZ,eAAe,CAAC,OAAO,CAAC,CAClB,CACL,CACA,CACT,CAAC;AACJ,CAAC,CAAC;AACF,OAAO,EAAE,UAAU,EAAE,CAAC"}
1
+ {"version":3,"file":"Date.Dialog.js","sourceRoot":"","sources":["../../src/date/Date.Dialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,MAAM,cAAc,GAAG;IACrB,MAAM,EAAE,YAAY;IACpB,QAAQ,EAAE,aAAa;IACvB,KAAK,EAAE,iBAAiB;IACxB,KAAK,EAAE,aAAa;CACZ,CAAC;AAiBX,MAAM,UAAU,GAAG,CAAC,EAClB,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,MAAM,EACN,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,GACK,EAAE,EAAE;IACrB,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;IACvD,MAAM,SAAS,GACb,QAAQ,CAAC,+BAA+B,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAEhE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,oBAAC,OAAO,kBACN,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAC,cAAc,EACxB,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,EAAE,CAAC,qBAAqB,EAAE;gBACnC,YAAY,EAAE,OAAO,KAAK,OAAO;aAClC,CAAC,IACE,YAAY,GAEf,QAAQ,CACD,CACX,CAAC;IACJ,CAAC;IAED,OAAO,CACL,oBAAC,KAAK,IACJ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,OAAO,EAAE,CAAC;QACZ,CAAC,gBACW,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAC9C,SAAS,EAAE,EAAE,CAAC,mBAAmB,EAAE;YACjC,0BAA0B,EAAE,SAAS;YACrC,YAAY,EAAE,OAAO,KAAK,OAAO;SAClC,CAAC,EACF,oBAAoB,QACpB,SAAS,EAAC,KAAK;QAEf,6BAAK,SAAS,EAAE,EAAE,CAAC,wBAAwB,CAAC;YACzC,QAAQ;YACT,oBAAC,MAAM,IACL,OAAO,EAAC,UAAU,EAClB,OAAO,EAAE,GAAG,EAAE,WAAC,OAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA,EAAA,EACzC,IAAI,EAAC,OAAO,EACZ,IAAI,EAAC,QAAQ,IAEZ,eAAe,CAAC,OAAO,CAAC,CAClB,CACL,CACA,CACT,CAAC;AACJ,CAAC,CAAC;AACF,OAAO,EAAE,UAAU,EAAE,CAAC"}
@@ -53,15 +53,25 @@ const ReactDayPicker = (_a) => {
53
53
  /**
54
54
  * In the case where we have:
55
55
  * - Mode: "range"
56
- * - selected: { from: undefined, to: Date }
56
+ * - selected: { from: undefined, to: Date } or
57
+ * - selected: { from: Date, to: undefined }
57
58
  *
58
- * RDP returns undefined for newSelection. We need to manually handle this case.
59
+ *
60
+ * RDP returns undefined for newSelection. We need to manually handle these cases.
59
61
  */
60
62
  if (mode !== "range" || newSelection || !isDateRange(selected)) {
61
63
  handleSelect(newSelection);
62
64
  return;
63
65
  }
64
66
  if (!selected.to) {
67
+ /**
68
+ * If defaultSelected.from is defined, but not "to", and user selects the same date as "from",
69
+ * we interpret this as user wanting to select a single date range (from === to).
70
+ */
71
+ if (selected.from && isSameDay(selected.from, newDate)) {
72
+ handleSelect({ from: newDate, to: newDate });
73
+ return;
74
+ }
65
75
  handleSelect({ from: newDate, to: undefined });
66
76
  return;
67
77
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DatePicker.RDP.js","sourceRoot":"","sources":["../../../../src/date/datepicker/parts/DatePicker.RDP.tsx"],"names":[],"mappings":"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"}
@@ -3,11 +3,11 @@ export interface InternalHeaderUserProps extends HTMLAttributes<HTMLDivElement>
3
3
  /**
4
4
  * User name
5
5
  */
6
- name: string;
6
+ name: React.ReactNode;
7
7
  /**
8
8
  * User description
9
9
  */
10
- description?: string;
10
+ description?: React.ReactNode;
11
11
  }
12
12
  export declare const InternalHeaderUser: React.ForwardRefExoticComponent<InternalHeaderUserProps & React.RefAttributes<HTMLDivElement>>;
13
13
  export default InternalHeaderUser;
@@ -16,7 +16,7 @@ export const InternalHeaderUser = forwardRef((_a, ref) => {
16
16
  var { className, name, description } = _a, rest = __rest(_a, ["className", "name", "description"]);
17
17
  const { cn } = useRenameCSS();
18
18
  return (React.createElement("div", Object.assign({}, rest, { ref: ref, className: cn("navds-internalheader__user", className) }),
19
- React.createElement("span", null,
19
+ React.createElement("div", null,
20
20
  React.createElement(BodyShort, { size: "small", as: "div" }, name),
21
21
  description && React.createElement(Detail, { as: "div" }, description))));
22
22
  });
@@ -1 +1 @@
1
- {"version":3,"file":"InternalHeaderUser.js","sourceRoot":"","sources":["../../src/internal-header/InternalHeaderUser.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAkB,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAclD,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAG1C,CAAC,EAAyC,EAAE,GAAG,EAAE,EAAE;QAAlD,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,OAAW,EAAN,IAAI,cAAvC,oCAAyC,CAAF;IACxC,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC;IAE9B,OAAO,CACL,6CACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,4BAA4B,EAAE,SAAS,CAAC;QAEtD;YACE,oBAAC,SAAS,IAAC,IAAI,EAAC,OAAO,EAAC,EAAE,EAAC,KAAK,IAC7B,IAAI,CACK;YACX,WAAW,IAAI,oBAAC,MAAM,IAAC,EAAE,EAAC,KAAK,IAAE,WAAW,CAAU,CAClD,CACH,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,kBAAkB,CAAC"}
1
+ {"version":3,"file":"InternalHeaderUser.js","sourceRoot":"","sources":["../../src/internal-header/InternalHeaderUser.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAkB,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAclD,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAG1C,CAAC,EAAyC,EAAE,GAAG,EAAE,EAAE;QAAlD,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,OAAW,EAAN,IAAI,cAAvC,oCAAyC,CAAF;IACxC,MAAM,EAAE,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC;IAE9B,OAAO,CACL,6CACM,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CAAC,4BAA4B,EAAE,SAAS,CAAC;QAEtD;YACE,oBAAC,SAAS,IAAC,IAAI,EAAC,OAAO,EAAC,EAAE,EAAC,KAAK,IAC7B,IAAI,CACK;YACX,WAAW,IAAI,oBAAC,MAAM,IAAC,EAAE,EAAC,KAAK,IAAE,WAAW,CAAU,CACnD,CACF,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,kBAAkB,CAAC"}
@@ -11,7 +11,6 @@ var __rest = (this && this.__rest) || function (s, e) {
11
11
  };
12
12
  import { autoUpdate, arrow as flArrow, offset as flOffset, flip, shift, useFloating, } from "@floating-ui/react";
13
13
  import React, { forwardRef, useRef } from "react";
14
- import { useDateInputContext } from "../date/Date.Input.js";
15
14
  import { useModalContext } from "../modal/Modal.context.js";
16
15
  import { DismissableLayer } from "../overlays/dismissablelayer/DismissableLayer.js";
17
16
  import { useRenameCSS, useThemeInternal } from "../theme/Theme.js";
@@ -43,9 +42,7 @@ export const Popover = forwardRef((_a, ref) => {
43
42
  const { cn } = useRenameCSS();
44
43
  const arrowRef = useRef(null);
45
44
  const isInModal = useModalContext(false) !== undefined;
46
- const datepickerContext = useDateInputContext(false);
47
45
  const chosenStrategy = userStrategy !== null && userStrategy !== void 0 ? userStrategy : (isInModal ? "fixed" : "absolute");
48
- const chosenFlip = datepickerContext ? false : _flip;
49
46
  const themeContext = useThemeInternal(false);
50
47
  const { update, refs, placement: flPlacement, middlewareData: { arrow: { x: arrowX, y: arrowY } = {} }, floatingStyles, } = useFloating({
51
48
  strategy: chosenStrategy,
@@ -53,8 +50,11 @@ export const Popover = forwardRef((_a, ref) => {
53
50
  open,
54
51
  middleware: [
55
52
  flOffset(offset !== null && offset !== void 0 ? offset : ((themeContext === null || themeContext === void 0 ? void 0 : themeContext.isDarkside) ? 8 : arrow ? 16 : 4)),
56
- chosenFlip &&
57
- flip({ padding: 5, fallbackPlacements: ["bottom", "top"] }),
53
+ _flip &&
54
+ flip({
55
+ padding: 5,
56
+ fallbackPlacements: getOppositePlacement(placement),
57
+ }),
58
58
  shift({ padding: 12 }),
59
59
  flArrow({ element: arrowRef, padding: 8 }),
60
60
  ],
@@ -86,6 +86,28 @@ export const Popover = forwardRef((_a, ref) => {
86
86
  arrowRef.current = node;
87
87
  }, style: Object.assign(Object.assign(Object.assign({}, (arrowX != null ? { left: arrowX } : {})), (arrowY != null ? { top: arrowY } : {})), (staticSide ? { [staticSide]: "-0.5rem" } : {})), className: cn("navds-popover__arrow") })))));
88
88
  });
89
+ const oppositeSideMap = {
90
+ top: "bottom",
91
+ bottom: "top",
92
+ left: "right",
93
+ right: "left",
94
+ };
95
+ /**
96
+ * If placement is side+alignment, we want to preserve the alignment
97
+ * when flipping to the opposite side.
98
+ */
99
+ function getOppositePlacement(placement) {
100
+ /**
101
+ * In most cases, the fallback for left/right should be top/bottom
102
+ * as there is usually more space vertically than horizontally.
103
+ */
104
+ if (placement.startsWith("left") || placement.startsWith("right")) {
105
+ return ["bottom", "top"];
106
+ }
107
+ const [side, alignment] = placement.split("-");
108
+ const oppositeSide = oppositeSideMap[side];
109
+ return [alignment ? `${oppositeSide}-${alignment}` : oppositeSide];
110
+ }
89
111
  Popover.Content = PopoverContent;
90
112
  export default Popover;
91
113
  //# sourceMappingURL=Popover.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Popover.js","sourceRoot":"","sources":["../../src/popover/Popover.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Popover.js","sourceRoot":"","sources":["../../src/popover/Popover.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@navikt/ds-react",
3
- "version": "7.35.2",
3
+ "version": "7.36.0",
4
4
  "description": "React components from the Norwegian Labour and Welfare Administration.",
5
5
  "author": "Aksel, a team part of the Norwegian Labour and Welfare Administration.",
6
6
  "license": "MIT",
@@ -695,8 +695,8 @@
695
695
  "dependencies": {
696
696
  "@floating-ui/react": "0.27.8",
697
697
  "@floating-ui/react-dom": "^2.1.6",
698
- "@navikt/aksel-icons": "^7.35.2",
699
- "@navikt/ds-tokens": "^7.35.2",
698
+ "@navikt/aksel-icons": "^7.36.0",
699
+ "@navikt/ds-tokens": "^7.36.0",
700
700
  "clsx": "^2.1.0",
701
701
  "date-fns": "^4.0.0",
702
702
  "react-day-picker": "9.7.0"
@@ -65,7 +65,6 @@ const DateDialog = ({
65
65
  className={cn("navds-date__popover", {
66
66
  "navds-date": variant === "month",
67
67
  })}
68
- flip={false}
69
68
  {...popoverProps}
70
69
  >
71
70
  {children}
@@ -84,9 +84,11 @@ const ReactDayPicker = ({
84
84
  /**
85
85
  * In the case where we have:
86
86
  * - Mode: "range"
87
- * - selected: { from: undefined, to: Date }
87
+ * - selected: { from: undefined, to: Date } or
88
+ * - selected: { from: Date, to: undefined }
88
89
  *
89
- * RDP returns undefined for newSelection. We need to manually handle this case.
90
+ *
91
+ * RDP returns undefined for newSelection. We need to manually handle these cases.
90
92
  */
91
93
  if (mode !== "range" || newSelection || !isDateRange(selected)) {
92
94
  handleSelect(newSelection);
@@ -94,6 +96,14 @@ const ReactDayPicker = ({
94
96
  }
95
97
 
96
98
  if (!selected.to) {
99
+ /**
100
+ * If defaultSelected.from is defined, but not "to", and user selects the same date as "from",
101
+ * we interpret this as user wanting to select a single date range (from === to).
102
+ */
103
+ if (selected.from && isSameDay(selected.from, newDate)) {
104
+ handleSelect({ from: newDate, to: newDate });
105
+ return;
106
+ }
97
107
  handleSelect({ from: newDate, to: undefined });
98
108
  return;
99
109
  }
@@ -7,11 +7,11 @@ export interface InternalHeaderUserProps
7
7
  /**
8
8
  * User name
9
9
  */
10
- name: string;
10
+ name: React.ReactNode;
11
11
  /**
12
12
  * User description
13
13
  */
14
- description?: string;
14
+ description?: React.ReactNode;
15
15
  }
16
16
 
17
17
  export const InternalHeaderUser = forwardRef<
@@ -26,12 +26,12 @@ export const InternalHeaderUser = forwardRef<
26
26
  ref={ref}
27
27
  className={cn("navds-internalheader__user", className)}
28
28
  >
29
- <span>
29
+ <div>
30
30
  <BodyShort size="small" as="div">
31
31
  {name}
32
32
  </BodyShort>
33
33
  {description && <Detail as="div">{description}</Detail>}
34
- </span>
34
+ </div>
35
35
  </div>
36
36
  );
37
37
  });
@@ -1,4 +1,7 @@
1
1
  import {
2
+ Alignment,
3
+ Placement,
4
+ Side,
2
5
  autoUpdate,
3
6
  arrow as flArrow,
4
7
  offset as flOffset,
@@ -7,7 +10,6 @@ import {
7
10
  useFloating,
8
11
  } from "@floating-ui/react";
9
12
  import React, { HTMLAttributes, forwardRef, useRef } from "react";
10
- import { useDateInputContext } from "../date/Date.Input";
11
13
  import { useModalContext } from "../modal/Modal.context";
12
14
  import { DismissableLayer } from "../overlays/dismissablelayer/DismissableLayer";
13
15
  import { useRenameCSS, useThemeInternal } from "../theme/Theme";
@@ -121,9 +123,7 @@ export const Popover = forwardRef<HTMLDivElement, PopoverProps>(
121
123
  const { cn } = useRenameCSS();
122
124
  const arrowRef = useRef<HTMLDivElement | null>(null);
123
125
  const isInModal = useModalContext(false) !== undefined;
124
- const datepickerContext = useDateInputContext(false);
125
126
  const chosenStrategy = userStrategy ?? (isInModal ? "fixed" : "absolute");
126
- const chosenFlip = datepickerContext ? false : _flip;
127
127
 
128
128
  const themeContext = useThemeInternal(false);
129
129
 
@@ -139,8 +139,11 @@ export const Popover = forwardRef<HTMLDivElement, PopoverProps>(
139
139
  open,
140
140
  middleware: [
141
141
  flOffset(offset ?? (themeContext?.isDarkside ? 8 : arrow ? 16 : 4)),
142
- chosenFlip &&
143
- flip({ padding: 5, fallbackPlacements: ["bottom", "top"] }),
142
+ _flip &&
143
+ flip({
144
+ padding: 5,
145
+ fallbackPlacements: getOppositePlacement(placement),
146
+ }),
144
147
  shift({ padding: 12 }),
145
148
  flArrow({ element: arrowRef, padding: 8 }),
146
149
  ],
@@ -209,6 +212,32 @@ export const Popover = forwardRef<HTMLDivElement, PopoverProps>(
209
212
  },
210
213
  ) as PopoverComponent;
211
214
 
215
+ const oppositeSideMap: Record<Side, Side> = {
216
+ top: "bottom",
217
+ bottom: "top",
218
+ left: "right",
219
+ right: "left",
220
+ };
221
+
222
+ /**
223
+ * If placement is side+alignment, we want to preserve the alignment
224
+ * when flipping to the opposite side.
225
+ */
226
+ function getOppositePlacement(placement: Placement): Placement[] {
227
+ /**
228
+ * In most cases, the fallback for left/right should be top/bottom
229
+ * as there is usually more space vertically than horizontally.
230
+ */
231
+ if (placement.startsWith("left") || placement.startsWith("right")) {
232
+ return ["bottom", "top"];
233
+ }
234
+
235
+ const [side, alignment] = placement.split("-") as [Side, Alignment?];
236
+ const oppositeSide = oppositeSideMap[side];
237
+
238
+ return [alignment ? `${oppositeSide}-${alignment}` : oppositeSide];
239
+ }
240
+
212
241
  Popover.Content = PopoverContent;
213
242
 
214
243
  export default Popover;