Skip to content

Commit

Permalink
refactor(form-field): move to shared for split packages
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanoglesby08 committed Feb 14, 2018
1 parent 2580de1 commit 2033d4f
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 29 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react'
import PropTypes from 'prop-types'

import Fade from '../../../shared/components/Animation/Fade'
import StandaloneIcon from '../Icons/StandaloneIcon/StandaloneIcon'
import Fade from '../Animation/Fade'
import StandaloneIcon from '../../../src/components/Icons/StandaloneIcon/StandaloneIcon'

import iconWrapperStyles from '../Icons/IconWrapper.modules.scss'
import iconWrapperStyles from '../../../src/components/Icons/IconWrapper.modules.scss'

const FeedbackIcon = ({ showIcon, feedback }) => (
<Fade timeout={100} in={showIcon} mountOnEnter={true} unmountOnExit={true}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import React from 'react'
import PropTypes from 'prop-types'
import { childrenOfType } from 'airbnb-prop-types'

import safeRest from '../../utils/safeRest'
import generateId from '../../utils/generateId'
import safeRest from '../../../src/utils/safeRest'
import generateId from '../../../src/utils/generateId'

import Box from '../../../packages/Box/Box'
import Flexbox from '../../../shared/components/Flexbox/Flexbox'
import Text from '../Typography/Text/Text'
import Paragraph from '../Typography/Paragraph/Paragraph'
import InputFeedback from '../InputFeedback/InputFeedback'
import Tooltip from '../Tooltip/Tooltip'
import Flexbox from '../Flexbox/Flexbox'
import Text from '../../../src/components/Typography/Text/Text'
import Paragraph from '../../../src/components/Typography/Paragraph/Paragraph'
import InputFeedback from '../../../src/components/InputFeedback/InputFeedback'
import Tooltip from '../../../src/components/Tooltip/Tooltip'

import styles from './FormField.modules.scss'
import positionStyles from '../Position.modules.scss'
import positionStyles from '../../../src/components/Position.modules.scss'

const getClassName = (feedback, focus, disabled) => {
if (disabled) {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '../../scss/settings/colours';
@import '../../scss/settings/typography';
@import '../../../src/scss/settings/colours';
@import '../../../src/scss/settings/typography';

/* LABEL */

Expand All @@ -18,10 +18,10 @@
// This vertical padding fixes an IE11 bug that was causing the input value to jump slightly and get cut off.
composes: verticalPadding-2 horizontalPadding-3 from '../../../packages/Box/Box.modules.scss';

composes: thin rounded from '../Borders.modules.scss';
composes: thin rounded from '../../../src/components/Borders.modules.scss';

composes: font from '../Forms.modules.scss';
composes: medium mediumFont color from '../Typography/Text/Text.modules.scss';
composes: font from '../../../src/components/Forms.modules.scss';
composes: medium mediumFont color from '../../../src/components/Typography/Text/Text.modules.scss';

outline: 0;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import addRightPadding from '../addRightPadding'
import addRightPadding from '../addRightPadding'

describe('icon positioning calculations to prevent text overlapping', () => {
it('does not add padding when there are no visible icons', () => {
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions src/components/Input/Input.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import joinClassNames from '../../utils/joinClassNames'

import Tooltip from '../Tooltip/Tooltip'
import InputFeedback from '../InputFeedback/InputFeedback'
import FormField from '../FormField/FormField'
import FeedbackIcon from '../FormField/FeedbackIcon'
import FormField from '../../../shared/components/FormField/FormField'
import FeedbackIcon from '../../../shared/components/FormField/FeedbackIcon'

import addRightPadding from '../FormField/addRightPadding'
import addRightPadding from '../../../shared/components/FormField/addRightPadding'

import positionStyles from '../Position.modules.scss'
import formStyles from '../Forms.modules.scss'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Input/Input.modules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

.iconsPosition {
composes: absolute centerVertically from '../Position.modules.scss';
composes: iconRight from '../FormField/FormField.modules.scss';
composes: iconRight from '../../../shared/components/FormField/FormField.modules.scss';
}
6 changes: 3 additions & 3 deletions src/components/Select/Select.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import joinClassNames from '../../utils/joinClassNames'

import DecorativeIcon from '../Icons/DecorativeIcon/DecorativeIcon'
import Tooltip from '../Tooltip/Tooltip'
import FormField from '../FormField/FormField'
import FeedbackIcon from '../FormField/FeedbackIcon'
import FormField from '../../../shared/components/FormField/FormField'
import FeedbackIcon from '../../../shared/components/FormField/FeedbackIcon'
import Box from '../../../packages/Box/Box'

import addRightPadding from '../FormField/addRightPadding'
import addRightPadding from '../../../shared/components/FormField/addRightPadding'

import styles from './Select.modules.scss'
import iconWrapperStyles from '../Icons/IconWrapper.modules.scss'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Select/Select.modules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

.iconsPosition {
composes: absolute centerVertically from '../Position.modules.scss';
composes: iconRight from '../FormField/FormField.modules.scss';
composes: iconRight from '../../../shared/components/FormField/FormField.modules.scss';

z-index: 3;
pointer-events: none;
Expand Down
6 changes: 3 additions & 3 deletions src/components/TextArea/TextArea.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { childrenOfType } from 'airbnb-prop-types'
import joinClassNames from '../../utils/joinClassNames'

import Tooltip from '../Tooltip/Tooltip'
import FormField from '../FormField/FormField'
import FeedbackIcon from '../FormField/FeedbackIcon'
import FormField from '../../../shared/components/FormField/FormField'
import FeedbackIcon from '../../../shared/components/FormField/FeedbackIcon'

import addRightPadding from '../FormField/addRightPadding'
import addRightPadding from '../../../shared/components/FormField/addRightPadding'

import styles from './TextArea.modules.scss'
import positionStyles from '../Position.modules.scss'
Expand Down
2 changes: 1 addition & 1 deletion src/components/TextArea/TextArea.modules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

.feedbackIconPosition {
composes: absolute from '../Position.modules.scss';
composes: iconRight from '../FormField/FormField.modules.scss';
composes: iconRight from '../../../shared/components/FormField/FormField.modules.scss';

top: 0.5rem;
}

0 comments on commit 2033d4f

Please sign in to comment.