Skip to content

Commit

Permalink
chore: rename classNameBuilder functions in "views" and remove classN…
Browse files Browse the repository at this point in the history
…ameBuilder aliases with "use" prefix (#4505)

* chore: replace deprecated classNameBuilder functions (replace prefix 'use' with 'get') in views/Advertisement

* chore: replace deprecated classNameBuilder functions (replace prefix 'use' with 'get') in views/Card

* chore: replace deprecated classNameBuilder functions (replace prefix 'use' with 'get') in views/Comment

* chore: replace deprecated classNameBuilder functions (replace prefix 'use' with 'get') in views/Feed

* chore: replace deprecated classNameBuilder functions (replace prefix 'use' with 'get') in views/Item

* chore: replace deprecated classNameBuilder functions (replace prefix 'use' with 'get') in views/Statistic

* chore: remove deprecaetd unused classNameBuilders
  • Loading branch information
dominikdosoudil authored Nov 22, 2024
1 parent 74cbda4 commit a7e8c69
Show file tree
Hide file tree
Showing 18 changed files with 56 additions and 98 deletions.
35 changes: 0 additions & 35 deletions src/lib/classNameBuilders.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ import { numberToWord } from './numberToWord'
*/
export const getKeyOnly = (val, key) => val && key

/**
* @deprecated
*/
export const useKeyOnly = getKeyOnly

/**
* Props that require both a key and value to create a className.
* @param {*} val A props value
Expand All @@ -37,11 +32,6 @@ export const useKeyOnly = getKeyOnly
*/
export const getValueAndKey = (val, key) => val && val !== true && `${val} ${key}`

/**
* @deprecated
*/
export const useValueAndKey = getValueAndKey

/**
* Props whose key will be used in className, or value and key.
* @param {*} val A props value
Expand All @@ -57,11 +47,6 @@ export const useValueAndKey = getValueAndKey
*/
export const getKeyOrValueAndKey = (val, key) => val && (val === true ? key : `${val} ${key}`)

/**
* @deprecated
*/
export const useKeyOrValueAndKey = getKeyOrValueAndKey

//
// Prop to className exceptions
//
Expand Down Expand Up @@ -89,11 +74,6 @@ export const getMultipleProp = (val, key) => {
.join(' ')
}

/**
* @deprecated
*/
export const useMultipleProp = getMultipleProp

/**
* The "textAlign" prop follows the useValueAndKey except when the value is "justified'.
* In this case, only the class "justified" is used, ignoring the "aligned" class.
Expand All @@ -110,11 +90,6 @@ export const useMultipleProp = getMultipleProp
export const getTextAlignProp = (val) =>
val === 'justified' ? 'justified' : getValueAndKey(val, 'aligned')

/**
* @deprecated
*/
export const useTextAlignProp = getTextAlignProp

/**
* The "verticalAlign" prop follows the useValueAndKey.
*
Expand All @@ -126,11 +101,6 @@ export const useTextAlignProp = getTextAlignProp
*/
export const getVerticalAlignProp = (val) => getValueAndKey(val, 'aligned')

/**
* @deprecated
*/
export const useVerticalAlignProp = getVerticalAlignProp

/**
* Create "X", "X wide" and "equal width" classNames.
* "X" is a numberToWord value and "wide" is configurable.
Expand Down Expand Up @@ -162,8 +132,3 @@ export const getWidthProp = (val, widthClass = '', canEqual = false) => {
}
return numberToWord(val)
}

/**
* @deprecated
*/
export const useWidthProp = getWidthProp
7 changes: 0 additions & 7 deletions src/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@ export ModernAutoControlledComponent from './ModernAutoControlledComponent'
export * as childrenUtils from './childrenUtils'

export {
useKeyOnly,
getKeyOnly,
useKeyOrValueAndKey,
getKeyOrValueAndKey,
useValueAndKey,
getValueAndKey,
useMultipleProp,
getMultipleProp,
useTextAlignProp,
getTextAlignProp,
useVerticalAlignProp,
getVerticalAlignProp,
useWidthProp,
getWidthProp,
} from './classNameBuilders'

Expand Down
6 changes: 3 additions & 3 deletions src/views/Advertisement/Advertisement.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
customPropTypes,
getComponentType,
getUnhandledProps,
useKeyOnly,
getKeyOnly,
} from '../../lib'

/**
Expand All @@ -19,8 +19,8 @@ const Advertisement = React.forwardRef(function (props, ref) {
const classes = cx(
'ui',
unit,
useKeyOnly(centered, 'centered'),
useKeyOnly(test, 'test'),
getKeyOnly(centered, 'centered'),
getKeyOnly(test, 'test'),
'ad',
className,
)
Expand Down
10 changes: 5 additions & 5 deletions src/views/Card/Card.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useKeyOnly,
getKeyOnly,
useEventCallback,
} from '../../lib'
import Image from '../../elements/Image'
Expand Down Expand Up @@ -44,10 +44,10 @@ const Card = React.forwardRef(function (props, ref) {
const classes = cx(
'ui',
color,
useKeyOnly(centered, 'centered'),
useKeyOnly(fluid, 'fluid'),
useKeyOnly(link, 'link'),
useKeyOnly(raised, 'raised'),
getKeyOnly(centered, 'centered'),
getKeyOnly(fluid, 'fluid'),
getKeyOnly(link, 'link'),
getKeyOnly(raised, 'raised'),
'card',
className,
)
Expand Down
6 changes: 3 additions & 3 deletions src/views/Card/CardContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useKeyOnly,
useTextAlignProp,
getKeyOnly,
getTextAlignProp,
} from '../../lib'
import CardDescription from './CardDescription'
import CardHeader from './CardHeader'
Expand All @@ -23,7 +23,7 @@ import CardMeta from './CardMeta'
const CardContent = React.forwardRef(function (props, ref) {
const { children, className, content, description, extra, header, meta, textAlign } = props

const classes = cx(useKeyOnly(extra, 'extra'), useTextAlignProp(textAlign), 'content', className)
const classes = cx(getKeyOnly(extra, 'extra'), getTextAlignProp(textAlign), 'content', className)
const rest = getUnhandledProps(CardContent, props)
const ElementType = getComponentType(props)

Expand Down
4 changes: 2 additions & 2 deletions src/views/Card/CardDescription.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useTextAlignProp,
getTextAlignProp,
} from '../../lib'

/**
* A card can contain a description with one or more paragraphs.
*/
const CardDescription = React.forwardRef(function (props, ref) {
const { children, className, content, textAlign } = props
const classes = cx(useTextAlignProp(textAlign), 'description', className)
const classes = cx(getTextAlignProp(textAlign), 'description', className)
const rest = getUnhandledProps(CardDescription, props)
const ElementType = getComponentType(props)

Expand Down
16 changes: 8 additions & 8 deletions src/views/Card/CardGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useKeyOnly,
useTextAlignProp,
useWidthProp,
getKeyOnly,
getTextAlignProp,
getWidthProp,
} from '../../lib'
import Card from './Card'

Expand All @@ -33,11 +33,11 @@ const CardGroup = React.forwardRef(function (props, ref) {

const classes = cx(
'ui',
useKeyOnly(centered, 'centered'),
useKeyOnly(doubling, 'doubling'),
useKeyOnly(stackable, 'stackable'),
useTextAlignProp(textAlign),
useWidthProp(itemsPerRow),
getKeyOnly(centered, 'centered'),
getKeyOnly(doubling, 'doubling'),
getKeyOnly(stackable, 'stackable'),
getTextAlignProp(textAlign),
getWidthProp(itemsPerRow),
'cards',
className,
)
Expand Down
4 changes: 2 additions & 2 deletions src/views/Card/CardHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useTextAlignProp,
getTextAlignProp,
} from '../../lib'

/**
* A card can contain a header.
*/
const CardHeader = React.forwardRef(function (props, ref) {
const { children, className, content, textAlign } = props
const classes = cx(useTextAlignProp(textAlign), 'header', className)
const classes = cx(getTextAlignProp(textAlign), 'header', className)
const rest = getUnhandledProps(CardHeader, props)
const ElementType = getComponentType(props)

Expand Down
4 changes: 2 additions & 2 deletions src/views/Card/CardMeta.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useTextAlignProp,
getTextAlignProp,
} from '../../lib'

/**
* A card can contain content metadata.
*/
const CardMeta = React.forwardRef(function (props, ref) {
const { children, className, content, textAlign } = props
const classes = cx(useTextAlignProp(textAlign), 'meta', className)
const classes = cx(getTextAlignProp(textAlign), 'meta', className)
const rest = getUnhandledProps(CardMeta, props)
const ElementType = getComponentType(props)

Expand Down
4 changes: 2 additions & 2 deletions src/views/Comment/Comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
customPropTypes,
getComponentType,
getUnhandledProps,
useKeyOnly,
getKeyOnly,
} from '../../lib'
import CommentAction from './CommentAction'
import CommentActions from './CommentActions'
Expand All @@ -24,7 +24,7 @@ import CommentText from './CommentText'
const Comment = React.forwardRef(function (props, ref) {
const { className, children, collapsed, content } = props

const classes = cx(useKeyOnly(collapsed, 'collapsed'), 'comment', className)
const classes = cx(getKeyOnly(collapsed, 'collapsed'), 'comment', className)
const rest = getUnhandledProps(Comment, props)
const ElementType = getComponentType(props)

Expand Down
4 changes: 2 additions & 2 deletions src/views/Comment/CommentAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
customPropTypes,
getComponentType,
getUnhandledProps,
useKeyOnly,
getKeyOnly,
} from '../../lib'

/**
Expand All @@ -16,7 +16,7 @@ import {
const CommentAction = React.forwardRef(function (props, ref) {
const { active, className, children, content } = props

const classes = cx(useKeyOnly(active, 'active'), className)
const classes = cx(getKeyOnly(active, 'active'), className)
const rest = getUnhandledProps(CommentAction, props)
const ElementType = getComponentType(props, { defaultAs: 'a' })

Expand Down
8 changes: 4 additions & 4 deletions src/views/Comment/CommentGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useKeyOnly,
getKeyOnly,
} from '../../lib'

/**
Expand All @@ -21,9 +21,9 @@ const CommentGroup = React.forwardRef(function (props, ref) {
const classes = cx(
'ui',
size,
useKeyOnly(collapsed, 'collapsed'),
useKeyOnly(minimal, 'minimal'),
useKeyOnly(threaded, 'threaded'),
getKeyOnly(collapsed, 'collapsed'),
getKeyOnly(minimal, 'minimal'),
getKeyOnly(threaded, 'threaded'),
'comments',
className,
)
Expand Down
6 changes: 3 additions & 3 deletions src/views/Feed/FeedExtra.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
customPropTypes,
getComponentType,
getUnhandledProps,
useKeyOnly,
getKeyOnly,
} from '../../lib'

/**
Expand All @@ -19,8 +19,8 @@ const FeedExtra = React.forwardRef(function (props, ref) {
const { children, className, content, images, text } = props

const classes = cx(
useKeyOnly(images, 'images'),
useKeyOnly(content || text, 'text'),
getKeyOnly(images, 'images'),
getKeyOnly(content || text, 'text'),
'extra',
className,
)
Expand Down
4 changes: 2 additions & 2 deletions src/views/Item/ItemContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useVerticalAlignProp,
getVerticalAlignProp,
} from '../../lib'
import ItemHeader from './ItemHeader'
import ItemDescription from './ItemDescription'
Expand All @@ -21,7 +21,7 @@ import ItemMeta from './ItemMeta'
const ItemContent = React.forwardRef(function (props, ref) {
const { children, className, content, description, extra, header, meta, verticalAlign } = props

const classes = cx(useVerticalAlignProp(verticalAlign), 'content', className)
const classes = cx(getVerticalAlignProp(verticalAlign), 'content', className)
const rest = getUnhandledProps(ItemContent, props)
const ElementType = getComponentType(props)

Expand Down
12 changes: 6 additions & 6 deletions src/views/Item/ItemGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
customPropTypes,
getComponentType,
getUnhandledProps,
useKeyOnly,
useKeyOrValueAndKey,
getKeyOnly,
getKeyOrValueAndKey,
} from '../../lib'
import Item from './Item'

Expand All @@ -21,10 +21,10 @@ const ItemGroup = React.forwardRef(function (props, ref) {

const classes = cx(
'ui',
useKeyOnly(divided, 'divided'),
useKeyOnly(link, 'link'),
useKeyOnly(unstackable, 'unstackable'),
useKeyOrValueAndKey(relaxed, 'relaxed'),
getKeyOnly(divided, 'divided'),
getKeyOnly(link, 'link'),
getKeyOnly(unstackable, 'unstackable'),
getKeyOrValueAndKey(relaxed, 'relaxed'),
'items',
className,
)
Expand Down
10 changes: 5 additions & 5 deletions src/views/Statistic/Statistic.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
getComponentType,
getUnhandledProps,
SUI,
useKeyOnly,
useValueAndKey,
getKeyOnly,
getValueAndKey,
} from '../../lib'
import StatisticGroup from './StatisticGroup'
import StatisticLabel from './StatisticLabel'
Expand Down Expand Up @@ -39,9 +39,9 @@ const Statistic = React.forwardRef(function (props, ref) {
'ui',
color,
size,
useValueAndKey(floated, 'floated'),
useKeyOnly(horizontal, 'horizontal'),
useKeyOnly(inverted, 'inverted'),
getValueAndKey(floated, 'floated'),
getKeyOnly(horizontal, 'horizontal'),
getKeyOnly(inverted, 'inverted'),
'statistic',
className,
)
Expand Down
Loading

0 comments on commit a7e8c69

Please sign in to comment.