react-bootstrap 2.0.3 → 2.1.2

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.
@@ -1,11 +1,12 @@
1
1
  import * as React from 'react';
2
- import { SelectCallback } from '@restart/ui/types';
2
+ import { AccordionSelectCallback, AccordionEventKey } from './AccordionContext';
3
3
  import { BsPrefixProps, BsPrefixRefForwardingComponent } from './helpers';
4
4
  export interface AccordionProps extends Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'>, BsPrefixProps {
5
- activeKey?: string;
6
- defaultActiveKey?: string;
7
- onSelect?: SelectCallback;
5
+ activeKey?: AccordionEventKey;
6
+ defaultActiveKey?: AccordionEventKey;
7
+ onSelect?: AccordionSelectCallback;
8
8
  flush?: boolean;
9
+ alwaysOpen?: boolean;
9
10
  }
10
11
  declare const _default: BsPrefixRefForwardingComponent<"div", AccordionProps> & {
11
12
  Button: BsPrefixRefForwardingComponent<"div", import("./AccordionButton").AccordionButtonProps>;
package/cjs/Accordion.js CHANGED
@@ -40,6 +40,7 @@ const Accordion = /*#__PURE__*/React.forwardRef((props, ref) => {
40
40
  className,
41
41
  onSelect,
42
42
  flush,
43
+ alwaysOpen,
43
44
  ...controlledProps
44
45
  } = (0, _uncontrollable.useUncontrolled)(props, {
45
46
  activeKey: 'onSelect'
@@ -47,8 +48,9 @@ const Accordion = /*#__PURE__*/React.forwardRef((props, ref) => {
47
48
  const prefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'accordion');
48
49
  const contextValue = (0, React.useMemo)(() => ({
49
50
  activeEventKey: activeKey,
50
- onSelect
51
- }), [activeKey, onSelect]);
51
+ onSelect,
52
+ alwaysOpen
53
+ }), [activeKey, onSelect, alwaysOpen]);
52
54
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_AccordionContext.default.Provider, {
53
55
  value: contextValue,
54
56
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
@@ -10,7 +10,7 @@ var React = _interopRequireWildcard(require("react"));
10
10
 
11
11
  var _classnames = _interopRequireDefault(require("classnames"));
12
12
 
13
- var _AccordionContext = _interopRequireDefault(require("./AccordionContext"));
13
+ var _AccordionContext = _interopRequireWildcard(require("./AccordionContext"));
14
14
 
15
15
  var _AccordionItemContext = _interopRequireDefault(require("./AccordionItemContext"));
16
16
 
@@ -25,16 +25,31 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
25
25
  function useAccordionButton(eventKey, onClick) {
26
26
  const {
27
27
  activeEventKey,
28
- onSelect
28
+ onSelect,
29
+ alwaysOpen
29
30
  } = (0, React.useContext)(_AccordionContext.default);
30
31
  return e => {
31
32
  /*
32
33
  Compare the event key in context with the given event key.
33
34
  If they are the same, then collapse the component.
34
35
  */
35
- const eventKeyPassed = eventKey === activeEventKey ? null : eventKey;
36
- if (onSelect) onSelect(eventKeyPassed, e);
37
- if (onClick) onClick(e);
36
+ let eventKeyPassed = eventKey === activeEventKey ? null : eventKey;
37
+
38
+ if (alwaysOpen) {
39
+ if (Array.isArray(activeEventKey)) {
40
+ if (activeEventKey.includes(eventKey)) {
41
+ eventKeyPassed = activeEventKey.filter(k => k !== eventKey);
42
+ } else {
43
+ eventKeyPassed = [...activeEventKey, eventKey];
44
+ }
45
+ } else {
46
+ // activeEventKey is undefined.
47
+ eventKeyPassed = [eventKey];
48
+ }
49
+ }
50
+
51
+ onSelect == null ? void 0 : onSelect(eventKeyPassed, e);
52
+ onClick == null ? void 0 : onClick(e);
38
53
  };
39
54
  }
40
55
 
@@ -64,7 +79,7 @@ const AccordionButton = /*#__PURE__*/React.forwardRef(({
64
79
  onClick: accordionOnClick,
65
80
  ...props,
66
81
  "aria-expanded": eventKey === activeEventKey,
67
- className: (0, _classnames.default)(className, bsPrefix, eventKey !== activeEventKey && 'collapsed')
82
+ className: (0, _classnames.default)(className, bsPrefix, !(0, _AccordionContext.isAccordionItemSelected)(activeEventKey, eventKey) && 'collapsed')
68
83
  });
69
84
  });
70
85
  AccordionButton.displayName = 'AccordionButton';
@@ -13,7 +13,7 @@ var _ThemeProvider = require("./ThemeProvider");
13
13
 
14
14
  var _Collapse = _interopRequireDefault(require("./Collapse"));
15
15
 
16
- var _AccordionContext = _interopRequireDefault(require("./AccordionContext"));
16
+ var _AccordionContext = _interopRequireWildcard(require("./AccordionContext"));
17
17
 
18
18
  var _jsxRuntime = require("react/jsx-runtime");
19
19
 
@@ -35,7 +35,7 @@ const AccordionCollapse = /*#__PURE__*/React.forwardRef(({
35
35
  bsPrefix = (0, _ThemeProvider.useBootstrapPrefix)(bsPrefix, 'accordion-collapse');
36
36
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Collapse.default, {
37
37
  ref: ref,
38
- in: activeEventKey === eventKey,
38
+ in: (0, _AccordionContext.isAccordionItemSelected)(activeEventKey, eventKey),
39
39
  ...props,
40
40
  className: (0, _classnames.default)(className, bsPrefix),
41
41
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
@@ -1,8 +1,11 @@
1
1
  import * as React from 'react';
2
- import { SelectCallback } from '@restart/ui/types';
2
+ export declare type AccordionEventKey = string | string[] | null | undefined;
3
+ export declare type AccordionSelectCallback = (eventKey: AccordionEventKey, e: React.SyntheticEvent<unknown>) => void;
3
4
  export interface AccordionContextValue {
4
- activeEventKey?: string;
5
- onSelect?: SelectCallback;
5
+ activeEventKey?: AccordionEventKey;
6
+ onSelect?: AccordionSelectCallback;
7
+ alwaysOpen?: boolean;
6
8
  }
9
+ export declare function isAccordionItemSelected(activeEventKey: AccordionEventKey, eventKey: string): boolean;
7
10
  declare const context: React.Context<AccordionContextValue>;
8
11
  export default context;
@@ -2,6 +2,7 @@
2
2
 
3
3
  exports.__esModule = true;
4
4
  exports.default = void 0;
5
+ exports.isAccordionItemSelected = isAccordionItemSelected;
5
6
 
6
7
  var React = _interopRequireWildcard(require("react"));
7
8
 
@@ -9,8 +10,11 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
9
10
 
10
11
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
11
12
 
13
+ function isAccordionItemSelected(activeEventKey, eventKey) {
14
+ return Array.isArray(activeEventKey) ? activeEventKey.includes(eventKey) : activeEventKey === eventKey;
15
+ }
16
+
12
17
  const context = /*#__PURE__*/React.createContext({});
13
18
  context.displayName = 'AccordionContext';
14
19
  var _default = context;
15
- exports.default = _default;
16
- module.exports = exports.default;
20
+ exports.default = _default;
package/cjs/Button.js CHANGED
@@ -41,8 +41,8 @@ const Button = /*#__PURE__*/React.forwardRef(({
41
41
  ...props
42
42
  });
43
43
  const Component = tagName;
44
- return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, { ...props,
45
- ...buttonProps,
44
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, { ...buttonProps,
45
+ ...props,
46
46
  ref: ref,
47
47
  className: (0, _classnames.default)(className, prefix, active && 'active', variant && `${prefix}-${variant}`, size && `${prefix}-${size}`, props.href && props.disabled && 'disabled')
48
48
  });
package/cjs/Modal.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { ModalProps as BaseModalProps } from '@restart/ui/Modal';
2
+ import { BaseModalProps } from '@restart/ui/Modal';
3
3
  import { BsPrefixRefForwardingComponent } from './helpers';
4
4
  export interface ModalProps extends Omit<BaseModalProps, 'role' | 'renderBackdrop' | 'renderDialog' | 'transition' | 'backdropTransition' | 'children'> {
5
5
  size?: 'sm' | 'lg' | 'xl';
@@ -2,7 +2,7 @@ import * as React from 'react';
2
2
  import { DropdownProps } from './Dropdown';
3
3
  import { DropdownMenuVariant } from './DropdownMenu';
4
4
  import { BsPrefixRefForwardingComponent } from './helpers';
5
- export interface NavDropdownProps extends Omit<DropdownProps, 'onSelect' | 'title'> {
5
+ export interface NavDropdownProps extends Omit<DropdownProps, 'title'> {
6
6
  title: React.ReactNode;
7
7
  disabled?: boolean;
8
8
  active?: boolean;
package/cjs/Overlay.js CHANGED
@@ -63,21 +63,22 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
63
63
  transition: actualTransition,
64
64
  children: (overlayProps, {
65
65
  arrowProps,
66
- placement,
67
66
  popper: popperObj,
68
67
  show
69
68
  }) => {
70
69
  var _popperObj$state, _popperObj$state$modi;
71
70
 
72
- wrapRefs(overlayProps, arrowProps);
71
+ wrapRefs(overlayProps, arrowProps); // Need to get placement from popper object, handling case when overlay is flipped using 'flip' prop
72
+
73
+ const updatedPlacement = popperObj == null ? void 0 : popperObj.placement;
73
74
  const popper = Object.assign(popperRef.current, {
74
75
  state: popperObj == null ? void 0 : popperObj.state,
75
76
  scheduleUpdate: popperObj == null ? void 0 : popperObj.update,
76
- placement,
77
+ placement: updatedPlacement,
77
78
  outOfBoundaries: (popperObj == null ? void 0 : (_popperObj$state = popperObj.state) == null ? void 0 : (_popperObj$state$modi = _popperObj$state.modifiersData.hide) == null ? void 0 : _popperObj$state$modi.isReferenceHidden) || false
78
79
  });
79
80
  if (typeof overlay === 'function') return overlay({ ...overlayProps,
80
- placement,
81
+ placement: updatedPlacement,
81
82
  show,
82
83
  ...(!transition && show && {
83
84
  className: 'show'
@@ -86,7 +87,7 @@ const Overlay = /*#__PURE__*/React.forwardRef(({
86
87
  arrowProps
87
88
  });
88
89
  return /*#__PURE__*/React.cloneElement(overlay, { ...overlayProps,
89
- placement,
90
+ placement: updatedPlacement,
90
91
  arrowProps,
91
92
  popper,
92
93
  className: (0, _classnames.default)(overlay.props.className, !transition && show && 'show'),
@@ -1,4 +1,3 @@
1
- /// <reference types="react" />
2
1
  import PropTypes from 'prop-types';
3
2
  import { TabsProps } from '@restart/ui/Tabs';
4
3
  import { TransitionType } from './helpers';
@@ -4,7 +4,7 @@ export interface ThemeContextValue {
4
4
  dir?: string;
5
5
  }
6
6
  export interface ThemeProviderProps extends Partial<ThemeContextValue> {
7
- children: React.ElementType;
7
+ children: React.ReactNode;
8
8
  }
9
9
  declare const Consumer: React.Consumer<ThemeContextValue>;
10
10
  declare function ThemeProvider({ prefixes, dir, children }: ThemeProviderProps): JSX.Element;
@@ -13,6 +13,8 @@ declare namespace ThemeProvider {
13
13
  }
14
14
  export declare function useBootstrapPrefix(prefix: string | undefined, defaultPrefix: string): string;
15
15
  export declare function useIsRTL(): boolean;
16
- declare function createBootstrapComponent(Component: any, opts: any): React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
16
+ declare function createBootstrapComponent(Component: any, opts: any): React.ForwardRefExoticComponent<{
17
+ bsPrefix?: string | undefined;
18
+ } & React.RefAttributes<any>>;
17
19
  export { createBootstrapComponent, Consumer as ThemeConsumer };
18
20
  export default ThemeProvider;
@@ -51,6 +51,7 @@ const ToggleButton = /*#__PURE__*/React.forwardRef(({
51
51
  ref: ref,
52
52
  className: (0, _classnames.default)(className, disabled && 'disabled'),
53
53
  type: undefined,
54
+ role: undefined,
54
55
  as: "label",
55
56
  htmlFor: id
56
57
  })]
@@ -1,2 +1,2 @@
1
1
  /// <reference types="react" />
2
- export default function safeFindDOMNode(componentOrElement: React.ComponentClass | Element | null | undefined): any;
2
+ export default function safeFindDOMNode(componentOrElement: React.ComponentClass | Element | null | undefined): Element | Text | null;