Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/buttons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@zendeskgarden/container-utilities": "^2.0.0",
"polished": "^4.0.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0"
"react-merge-refs": "^1.1.0"
},
"peerDependencies": {
"@zendeskgarden/react-theming": "^8.67.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/buttons/src/elements/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { forwardRef, MutableRefObject, SVGAttributes } from 'react';
import PropTypes from 'prop-types';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { IButtonProps, SIZE } from '../types';
import { StyledButton } from '../styled';
import { useButtonGroupContext } from '../utils/useButtonGroupContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/chrome/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dom-helpers": "^5.2.1",
"polished": "^4.0.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0"
"react-merge-refs": "^1.1.0"
},
"peerDependencies": {
"@zendeskgarden/react-theming": "^8.67.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/chrome/src/elements/sheet/Sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useRef, useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { useUIDSeed } from 'react-uid';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';

import { ISheetProps, PLACEMENT } from '../../types';
import { StyledSheet, StyledSheetWrapper } from '../../styled';
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns.next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@zendeskgarden/react-tooltips": "^8.74.1",
"polished": "^4.0.0",
"prop-types": "^15.7.2",
"react-merge-refs": "^2.0.0"
"react-merge-refs": "^1.1.0"
},
"peerDependencies": {
"@zendeskgarden/react-theming": "^8.67.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns.next/src/elements/combobox/Option.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { LiHTMLAttributes, forwardRef, useEffect, useMemo, useRef } from 'react';
import PropTypes from 'prop-types';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import AddIcon from '@zendeskgarden/svg-icons/src/16/plus-stroke.svg';
import NextIcon from '@zendeskgarden/svg-icons/src/16/chevron-right-stroke.svg';
import PreviousIcon from '@zendeskgarden/svg-icons/src/16/chevron-left-stroke.svg';
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns.next/src/elements/menu/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { LiHTMLAttributes, MutableRefObject, forwardRef, useMemo } from 'react';
import PropTypes from 'prop-types';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import AddIcon from '@zendeskgarden/svg-icons/src/16/plus-stroke.svg';
import NextIcon from '@zendeskgarden/svg-icons/src/16/chevron-right-stroke.svg';
import PreviousIcon from '@zendeskgarden/svg-icons/src/16/chevron-left-stroke.svg';
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns.next/src/elements/menu/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { RefObject, forwardRef, useContext, useMemo, useRef } from 'react';
import PropTypes from 'prop-types';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { ThemeContext } from 'styled-components';
import { useMenu } from '@zendeskgarden/container-menu';
import { DEFAULT_THEME, useWindow } from '@zendeskgarden/react-theming';
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"downshift": "^7.0.0",
"polished": "^4.0.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0",
"react-merge-refs": "^1.1.0",
"react-popper": "^1.3.4"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Reference } from 'react-popper';
import { composeEventHandlers } from '@zendeskgarden/container-utilities';
import Chevron from '@zendeskgarden/svg-icons/src/16/chevron-down-stroke.svg';
import { VALIDATION } from '@zendeskgarden/react-forms';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { IAutocompleteProps } from '../../types';
import { StyledFauxInput, StyledInput, StyledSelect } from '../../styled';
import useDropdownContext from '../../utils/useDropdownContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns/src/elements/Combobox/Combobox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
import { Reference } from 'react-popper';
import { KEY_CODES } from '@zendeskgarden/container-utilities';
import { MediaInput, VALIDATION } from '@zendeskgarden/react-forms';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { IComboboxProps } from '../../types';
import useDropdownContext from '../../utils/useDropdownContext';

Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns/src/elements/Fields/Field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import React, { useState, HTMLAttributes, useMemo, forwardRef } from 'react';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { Field as FormField } from '@zendeskgarden/react-forms';
import useDropdownContext from '../../utils/useDropdownContext';
import { FieldContext } from '../../utils/useFieldContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns/src/elements/Menu/Items/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useEffect, useRef, useMemo } from 'react';
import PropTypes from 'prop-types';
import SelectedSvg from '@zendeskgarden/svg-icons/src/16/check-lg-stroke.svg';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { IItemProps } from '../../../types';
import { StyledItem, StyledItemIcon } from '../../../styled';
import useDropdownContext from '../../../utils/useDropdownContext';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { useSelection } from '@zendeskgarden/container-selection';
import { KEY_CODES, composeEventHandlers } from '@zendeskgarden/container-utilities';
import { useDocument } from '@zendeskgarden/react-theming';
import Chevron from '@zendeskgarden/svg-icons/src/16/chevron-down-stroke.svg';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { IMultiselectProps } from '../../types';
import {
StyledFauxInput,
Expand Down
2 changes: 1 addition & 1 deletion packages/dropdowns/src/elements/Select/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Chevron from '@zendeskgarden/svg-icons/src/16/chevron-down-stroke.svg';
import { VALIDATION } from '@zendeskgarden/react-forms';
import PropTypes from 'prop-types';
import { Reference } from 'react-popper';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { ISelectProps } from '../../types';
import { StyledFauxInput, StyledInput, StyledSelect } from '../../styled';
import useDropdownContext from '../../utils/useDropdownContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"lodash.debounce": "^4.0.8",
"polished": "^4.0.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0"
"react-merge-refs": "^1.1.0"
},
"peerDependencies": {
"@zendeskgarden/react-theming": "^8.67.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/src/elements/MediaInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useState, useRef } from 'react';
import PropTypes from 'prop-types';
import { composeEventHandlers } from '@zendeskgarden/container-utilities';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { IMediaInputProps, VALIDATION } from '../types';
import { StyledTextMediaInput } from '../styled';
import { FauxInput } from './faux-input/FauxInput';
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/src/elements/Range.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { useState, useEffect, useCallback, useRef, ChangeEvent } from 'react';
import { composeEventHandlers } from '@zendeskgarden/container-utilities';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { IRangeProps } from '../types';
import useFieldContext from '../utils/useFieldContext';
import { StyledRangeInput } from '../styled';
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/src/elements/Textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useRef, useCallback, useLayoutEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { composeEventHandlers } from '@zendeskgarden/container-utilities';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { ITextareaProps, VALIDATION } from '../types';
import useFieldContext from '../utils/useFieldContext';
import { StyledTextarea } from '../styled';
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/src/elements/tiles/components/Label.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import React, { HTMLAttributes, useState, useEffect, useRef, forwardRef } from 'react';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { StyledTileLabel } from '../../../styled';
import { useTilesContext } from '../../../utils/useTilesContext';

Expand Down
2 changes: 1 addition & 1 deletion packages/grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@zendeskgarden/react-tooltips": "^8.74.1",
"polished": "^4.0.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0",
"react-merge-refs": "^1.1.0",
"use-resize-observer": "^9.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/src/elements/pane/Pane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { useState, useMemo, useRef, HTMLAttributes, forwardRef } from 'react';
import useResizeObserver from 'use-resize-observer';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { Splitter } from './components/Splitter';
import { Content } from './components/Content';
import { SplitterButton } from './components/SplitterButton';
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/src/elements/pane/components/Splitter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import React, {
useRef,
HTMLAttributes
} from 'react';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import PropTypes from 'prop-types';
import { ThemeContext } from 'styled-components';
import { composeEventHandlers } from '@zendeskgarden/container-utilities';
Expand Down
2 changes: 1 addition & 1 deletion packages/modals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@zendeskgarden/container-utilities": "^2.0.0",
"dom-helpers": "^5.1.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0",
"react-merge-refs": "^1.1.0",
"react-popper": "^2.2.3",
"react-transition-group": "^4.4.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/modals/src/elements/DrawerModal/DrawerModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import React, {
} from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { CSSTransition } from 'react-transition-group';
import { ThemeContext } from 'styled-components';
import { useModal } from '@zendeskgarden/container-modal';
Expand Down
2 changes: 1 addition & 1 deletion packages/modals/src/elements/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
import { useDocument, useText } from '@zendeskgarden/react-theming';
import { useModal } from '@zendeskgarden/container-modal';
import { useFocusVisible } from '@zendeskgarden/container-focusvisible';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import isWindow from 'dom-helpers/isWindow';
import ownerDocument from 'dom-helpers/ownerDocument';
import ownerWindow from 'dom-helpers/ownerWindow';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { ThemeContext } from 'styled-components';
import { usePopper } from 'react-popper';
import { CSSTransition } from 'react-transition-group';
import { useModal } from '@zendeskgarden/container-modal';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { getRtlPopperPlacement, getPopperPlacement } from '../../utils/gardenPlacements';
import { TooltipModalContext } from '../../utils/useTooltipModalContext';
import { StyledTooltipWrapper, StyledTooltipModal, StyledTooltipModalBackdrop } from '../../styled';
Expand Down
2 changes: 1 addition & 1 deletion packages/tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@zendeskgarden/container-utilities": "^2.0.0",
"polished": "^4.0.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0"
"react-merge-refs": "^1.1.0"
},
"peerDependencies": {
"@zendeskgarden/react-theming": "^8.67.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/tabs/src/elements/Tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React, { HTMLAttributes, MutableRefObject } from 'react';
import PropTypes from 'prop-types';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { ITabProps } from '../types';
import { StyledTab } from '../styled';
import { useTabsContext } from '../utils/useTabsContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/tooltips/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@zendeskgarden/container-utilities": "^2.0.0",
"polished": "^4.0.0",
"prop-types": "^15.5.7",
"react-merge-refs": "^2.0.0",
"react-merge-refs": "^1.1.0",
"react-popper": "^1.3.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/tooltips/src/elements/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React, { cloneElement, useRef, useEffect, useContext } from 'react';
import { createPortal } from 'react-dom';
import PropTypes from 'prop-types';
import { ThemeContext } from 'styled-components';
import { mergeRefs } from 'react-merge-refs';
import mergeRefs from 'react-merge-refs';
import { useTooltip } from '@zendeskgarden/container-tooltip';
import { composeEventHandlers, getControlledValue } from '@zendeskgarden/container-utilities';
import { Manager, Popper, Reference } from 'react-popper';
Expand Down
6 changes: 3 additions & 3 deletions utils/test/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ module.exports = {
testPathIgnorePatterns: ['/node_modules/', '<rootDir>/packages/.template'],
testEnvironment: 'jest-environment-jsdom',
setupFilesAfterEnv: ['<rootDir>/utils/test/jest.setup.js'],
modulePathIgnorePatterns: ['/node_modules'],
transformIgnorePatterns: ['/node_modules/(?!(@zendeskgarden|react-merge-refs))'],
modulePathIgnorePatterns: ['./node_modules'],
transformIgnorePatterns: ['\\/node_modules\\/(?!@zendeskgarden)'],
transform: {
'^.+\\.(t|j|mj)sx?$': [
'^.+\\.(t|j)sx?$': [
'@swc/jest',
{
jsc: {
Expand Down