Skip to content

Move remaining deprecated components to src/deprecated #1917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2022
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
2 changes: 1 addition & 1 deletion src/__tests__/BorderBox.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ expect.extend(toHaveNoViolations)
describe('BorderBox', () => {
behavesAsComponent({Component: BorderBox})

checkExports('BorderBox', {
checkExports('deprecated/BorderBox', {
default: BorderBox
})

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/Dropdown.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expect.extend(toHaveNoViolations)
describe('Dropdown', () => {
behavesAsComponent({Component: Dropdown, toRender: () => <Dropdown>Hello!</Dropdown>})

checkExports('Dropdown', {
checkExports('deprecated/Dropdown', {
default: Dropdown
})

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/Dropdown.types.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import Dropdown from '../Dropdown'
import Dropdown from '../deprecated/Dropdown'

export function shouldAcceptCallWithNoProps() {
return <Dropdown />
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/Flex.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expect.extend(toHaveNoViolations)
describe('Flex', () => {
behavesAsComponent({Component: Flex})

checkExports('Flex', {
checkExports('deprecated/Flex', {
default: Flex
})

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/Grid.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ expect.extend(toHaveNoViolations)
describe('Grid', () => {
behavesAsComponent({Component: Grid})

checkExports('Grid', {
checkExports('deprecated/Grid', {
default: Grid
})

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/Position.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('position components', () => {
describe('Absolute', () => {
behavesAsComponent({Component: Absolute})

checkExports('Position', {
checkExports('deprecated/Position', {
default: Position,
Absolute,
Fixed,
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/SelectMenu.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {mount, render, renderRoot, COMPONENT_DISPLAY_NAME_REGEX, checkExports} f
import {render as HTMLRender, cleanup} from '@testing-library/react'
import {axe, toHaveNoViolations} from 'jest-axe'
import 'babel-polyfill'
import {SelectMenuModalProps, SelectMenuItemProps, SelectMenuTabProps} from '../SelectMenu'
import {SelectMenuModalProps, SelectMenuItemProps, SelectMenuTabProps} from '../deprecated/SelectMenu'
expect.extend(toHaveNoViolations)

const BasicSelectMenu = ({
Expand Down Expand Up @@ -63,7 +63,7 @@ const MenuWithTabs = ({onClick}: {onClick?: SelectMenuTabProps['onClick']}) => {
}

describe('SelectMenu', () => {
checkExports('SelectMenu', {
checkExports('deprecated/SelectMenu', {
default: SelectMenu
})

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/SelectMenu.types.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import SelectMenu from '../SelectMenu'
import SelectMenu from '../deprecated/SelectMenu'

export function shouldAcceptCallWithNoProps() {
return <SelectMenu />
Expand Down
2 changes: 1 addition & 1 deletion src/BorderBox.tsx → src/deprecated/BorderBox.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components'
import Box, {BoxProps} from './Box'
import Box, {BoxProps} from '../Box'

export type BorderBoxProps = BoxProps

Expand Down
14 changes: 7 additions & 7 deletions src/Dropdown.tsx → src/deprecated/Dropdown.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react'
import styled from 'styled-components'
import Button, {ButtonProps} from './deprecated/Button'
import {get} from './constants'
import Details, {DetailsProps} from './Details'
import getDirectionStyles from './DropdownStyles'
import useDetails from './hooks/useDetails'
import sx, {SxProp} from './sx'
import {ComponentProps} from './utils/types'
import Button, {ButtonProps} from './Button'
import {get} from '../constants'
import Details, {DetailsProps} from '../Details'
import getDirectionStyles from '../DropdownStyles'
import useDetails from '../hooks/useDetails'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'

const StyledDetails = styled(Details)`
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion src/Flex.tsx → src/deprecated/Flex.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components'
import Box, {BoxProps} from './Box'
import Box, {BoxProps} from '../Box'

export type FlexProps = BoxProps

Expand Down
2 changes: 1 addition & 1 deletion src/Grid.tsx → src/deprecated/Grid.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components'
import Box, {BoxProps} from './Box'
import Box, {BoxProps} from '../Box'

export type GridProps = BoxProps

Expand Down
4 changes: 2 additions & 2 deletions src/Position.tsx → src/deprecated/Position.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import styled from 'styled-components'
import Box from './Box'
import {ComponentProps} from './utils/types'
import Box from '../Box'
import {ComponentProps} from '../utils/types'

type StyledPositionProps = {as?: React.ElementType}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useCallback, useEffect, useRef, useState} from 'react'
import styled from 'styled-components'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'
import useKeyboardNav from './hooks/useKeyboardNav'
import {MenuContext} from './SelectMenuContext'
import SelectMenuDivider from './SelectMenuDivider'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled, {css} from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'

const dividerStyles = css`
padding: ${get('space.1')} ${get('space.3')};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, {forwardRef, useContext, useEffect, useRef} from 'react'
import styled from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import TextInput, {TextInputProps} from '../TextInput'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import TextInput, {TextInputProps} from '../../TextInput'
import {ComponentProps} from '../../utils/types'
import {MenuContext} from './SelectMenuContext'

const StyledForm = styled.form<SxProp>`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled, {css} from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'

const footerStyles = css`
margin-top: -1px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import styled from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'

// SelectMenu.Header is intentionally not exported, it's an internal component used in
// SelectMenu.Modal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {CheckIcon} from '@primer/octicons-react'
import React, {forwardRef, useContext, useRef} from 'react'
import styled, {css} from 'styled-components'
import {get} from '../constants'
import StyledOcticon from '../StyledOcticon'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import StyledOcticon from '../../StyledOcticon'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'
import {MenuContext} from './SelectMenuContext'

export const listItemStyles = css`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled, {css} from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'

const listStyles = css`
position: relative;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react'
import styled from 'styled-components'
import {get} from '../constants'
import Spinner from '../Spinner'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import Spinner from '../../Spinner'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'

const Animation = styled.div<SxProp>`
padding: ${get('space.6')} ${get('space.4')};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react'
import styled, {css, keyframes} from 'styled-components'
import {width, WidthProps} from 'styled-system'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'

type StyledModalProps = {
filter?: boolean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import classnames from 'classnames'
import React, {useContext, useEffect} from 'react'
import styled, {css} from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'
import {MenuContext} from './SelectMenuContext'

const tabStyles = css`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {useContext} from 'react'
import styled from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'
import {MenuContext} from './SelectMenuContext'
import SelectMenuList from './SelectMenuList'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import styled, {css} from 'styled-components'
import {get} from '../constants'
import sx, {SxProp} from '../sx'
import {ComponentProps} from '../utils/types'
import {get} from '../../constants'
import sx, {SxProp} from '../../sx'
import {ComponentProps} from '../../utils/types'

const tabWrapperStyles = css`
display: flex;
Expand Down
File renamed without changes.
24 changes: 12 additions & 12 deletions src/deprecated/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@
* example: import {FormGroup} from '@primer/react/deprecated
*/

export {default as BorderBox} from '../BorderBox'
export type {BorderBoxProps} from '../BorderBox'
export {default as BorderBox} from './BorderBox'
export type {BorderBoxProps} from './BorderBox'
export {default as ChoiceFieldset, Item} from './ChoiceFieldset'
export {default as ChoiceInputField} from './ChoiceInputField'
export {default as Flex} from '../Flex'
export type {FlexProps} from '../Flex'
export {default as Grid} from '../Grid'
export type {GridProps} from '../Grid'
export {default as Position, Absolute, Fixed, Relative, Sticky} from '../Position'
export type {PositionProps, AbsoluteProps, FixedProps, RelativeProps, StickyProps} from '../Position'
export {default as Dropdown} from '../Dropdown'
export {default as Flex} from './Flex'
export type {FlexProps} from './Flex'
export {default as Grid} from './Grid'
export type {GridProps} from './Grid'
export {default as Position, Absolute, Fixed, Relative, Sticky} from './Position'
export type {PositionProps, AbsoluteProps, FixedProps, RelativeProps, StickyProps} from './Position'
export {default as Dropdown} from './Dropdown'
export type {
DropdownProps,
DropdownCaretProps,
DropdownButtonProps,
DropdownItemProps,
DropdownMenuProps
} from '../Dropdown'
} from './Dropdown'
export {default as FormGroup} from './FormGroup'
export type {FormGroupProps, FormGroupLabelProps} from './FormGroup'
export {default as InputField} from './InputField'
export {default as Label} from './Label'
export type {LabelProps} from './Label'
export {default as SelectMenu} from '../SelectMenu'
export {default as SelectMenu} from './SelectMenu'
export type {
SelectMenuProps,
SelectMenuDividerProps,
Expand All @@ -43,7 +43,7 @@ export type {
SelectMenuTabProps,
SelectMenuTabPanelProps,
SelectMenuLoadingAnimationProps
} from '../SelectMenu'
} from './SelectMenu'
export {ActionList} from './ActionList'
export type {ActionListProps} from './ActionList'
export {ActionMenu} from './ActionMenu'
Expand Down