This repository was archived by the owner on Mar 4, 2020. It is now read-only.
chore(Box|Button|Image|Avatar): converting components with hooks #2238
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,34 @@ | ||
| import { Accessibility } from '@fluentui/accessibility' | ||
| import { | ||
| getElementType, | ||
| getUnhandledProps, | ||
| useAccessibility, | ||
| useStyles, | ||
| useTelemetry, | ||
| } from '@fluentui/react-bindings' | ||
| import * as customPropTypes from '@fluentui/react-proptypes' | ||
| import * as PropTypes from 'prop-types' | ||
| import * as React from 'react' | ||
| // @ts-ignore | ||
| import { ThemeContext } from 'react-fela' | ||
|
There was a problem hiding this comment. Avatar.tsx should not refer to fela specifics directly. @jdhuntington for heads up here. We should expect the base component to simply take in a Then createComponent can abstract how classes gets injected. export const Avatar = createComponent(AvatarBase, { stuff to build `classes` attribute });There was a problem hiding this comment. It's not Fela specifics. We use this context only by historical reasons. We should use own context instead. |
||
|
|
||
| import Image, { ImageProps } from '../Image/Image' | ||
| import Label, { LabelProps } from '../Label/Label' | ||
| import Status, { StatusProps } from '../Status/Status' | ||
| import { | ||
| WithAsProp, | ||
| ShorthandValue, | ||
| withSafeTypeForAs, | ||
| FluentComponentStaticProps, | ||
| ProviderContextPrepared, | ||
| } from '../../types' | ||
| import { createShorthandFactory, UIComponentProps, commonPropTypes, SizeValue } from '../../utils' | ||
|
|
||
| export interface AvatarProps extends UIComponentProps { | ||
| /** | ||
| * Accessibility behavior if overridden by the user. | ||
| */ | ||
| accessibility?: Accessibility<never> | ||
|
|
||
| /** Shorthand for the image. */ | ||
| image?: ShorthandValue<ImageProps> | ||
|
|
@@ -40,87 +49,121 @@ export interface AvatarProps extends UIComponentProps { | |
| getInitials?: (name: string) => string | ||
| } | ||
|
|
||
| const Avatar: React.FC<WithAsProp<AvatarProps>> & | ||
| FluentComponentStaticProps<AvatarProps> = props => { | ||
| const context: ProviderContextPrepared = React.useContext(ThemeContext) | ||
| const { setStart, setEnd } = useTelemetry(Avatar.displayName, context.telemetry) | ||
| setStart() | ||
|
|
||
| const { | ||
| accessibility, | ||
| className, | ||
| design, | ||
| getInitials, | ||
| label, | ||
| image, | ||
| name, | ||
| size, | ||
| status, | ||
| styles, | ||
| variables, | ||
| } = props | ||
|
|
||
| const getA11Props = useAccessibility(accessibility, { | ||
| debugName: Avatar.displayName, | ||
| rtl: context.rtl, | ||
| }) | ||
| const { classes, styles: resolvedStyles } = useStyles(Avatar.displayName, { | ||
| className: Avatar.className, | ||
| mapPropsToStyles: () => ({ size }), | ||
| mapPropsToInlineStyles: () => ({ | ||
| className, | ||
| design, | ||
| styles, | ||
| variables, | ||
| }), | ||
| }) | ||
|
|
||
| const ElementType = getElementType(props) | ||
| const unhandledProps = getUnhandledProps(Avatar.handledProps, props) | ||
|
|
||
| const result = ( | ||
| <ElementType {...getA11Props('root', { className: classes.root, ...unhandledProps })}> | ||
| {Image.create(image, { | ||
| defaultProps: () => | ||
| getA11Props('image', { | ||
| fluid: true, | ||
| avatar: true, | ||
| title: name, | ||
| styles: resolvedStyles.image, | ||
| }), | ||
| })} | ||
| {!image && | ||
| Label.create(label || {}, { | ||
| defaultProps: () => | ||
| getA11Props('label', { | ||
| content: getInitials(name), | ||
| circular: true, | ||
| title: name, | ||
| styles: resolvedStyles.label, | ||
| }), | ||
| })} | ||
| {Status.create(status, { | ||
| defaultProps: () => | ||
| getA11Props('status', { | ||
| size, | ||
| styles: resolvedStyles.status, | ||
| }), | ||
| })} | ||
| </ElementType> | ||
| ) | ||
|
|
||
| setEnd() | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| Avatar.className = 'ui-avatar' | ||
| Avatar.displayName = 'Avatar' | ||
|
|
||
| Avatar.defaultProps = { | ||
| size: 'medium', | ||
| getInitials(name: string) { | ||
| if (!name) { | ||
| return '' | ||
| } | ||
|
|
||
| const reducedName = name | ||
| .replace(/\s*\(.*?\)\s*/g, ' ') | ||
| .replace(/\s*{.*?}\s*/g, ' ') | ||
| .replace(/\s*\[.*?]\s*/g, ' ') | ||
|
|
||
| const initials = reducedName | ||
| .split(' ') | ||
| .filter(item => item !== '') | ||
| .map(item => item.charAt(0)) | ||
| .reduce((accumulator, currentValue) => accumulator + currentValue) | ||
|
|
||
| if (initials.length > 2) { | ||
| return initials.charAt(0) + initials.charAt(initials.length - 1) | ||
| } | ||
| return initials | ||
| }, | ||
| } | ||
|
|
||
| Avatar.propTypes = { | ||
| ...commonPropTypes.createCommon({ | ||
| children: false, | ||
| content: false, | ||
| }), | ||
| name: PropTypes.string, | ||
| image: customPropTypes.itemShorthandWithoutJSX, | ||
| label: customPropTypes.itemShorthand, | ||
| size: customPropTypes.size, | ||
| status: customPropTypes.itemShorthand, | ||
| getInitials: PropTypes.func, | ||
| } | ||
| Avatar.handledProps = Object.keys(Avatar.propTypes) as any | ||
|
|
||
| Avatar.create = createShorthandFactory({ Component: Avatar, mappedProp: 'name' }) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.