Skip to content

Commit a81f14d

Browse files
AJIXuMuKAJIXuMuK
committed
refactoring, granular imports
1 parent 80e1af1 commit a81f14d

File tree

6 files changed

+144
-146
lines changed

6 files changed

+144
-146
lines changed

‎src/controls/modernTaxonomyPicker/ModernTaxonomyPicker.tsx

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,44 @@ import * as React from 'react';
22
import { BaseComponentContext } from '@microsoft/sp-component-base';
33
import { Guid } from '@microsoft/sp-core-library';
44
import { IIconProps } from 'office-ui-fabric-react/lib/components/Icon';
5-
import { PrimaryButton,
6-
DefaultButton,
7-
IconButton,
8-
IButtonStyles
9-
} from 'office-ui-fabric-react/lib/Button';
5+
import {
6+
PrimaryButton,
7+
DefaultButton,
8+
IconButton,
9+
IButtonStyles
10+
} from 'office-ui-fabric-react/lib/Button';
1011
import { Label } from 'office-ui-fabric-react/lib/Label';
11-
import { Panel,
12-
PanelType
13-
} from 'office-ui-fabric-react/lib/Panel';
14-
import { IBasePickerStyleProps,
15-
IBasePickerStyles,
16-
ISuggestionItemProps
17-
} from 'office-ui-fabric-react/lib/Pickers';
18-
import { IStackTokens,
19-
Stack
20-
} from 'office-ui-fabric-react/lib/Stack';
12+
import {
13+
Panel,
14+
PanelType
15+
} from 'office-ui-fabric-react/lib/Panel';
16+
import {
17+
IBasePickerStyleProps,
18+
IBasePickerStyles,
19+
ISuggestionItemProps
20+
} from 'office-ui-fabric-react/lib/Pickers';
21+
import {
22+
IStackTokens,
23+
Stack
24+
} from 'office-ui-fabric-react/lib/Stack';
2125
import { IStyleFunctionOrObject } from 'office-ui-fabric-react/lib/Utilities';
2226
import { sp } from '@pnp/sp';
2327
import { SPTaxonomyService } from '../../services/SPTaxonomyService';
2428
import { TaxonomyPanelContents } from './taxonomyPanelContents';
2529
import styles from './ModernTaxonomyPicker.module.scss';
2630
import * as strings from 'ControlStrings';
27-
import { TooltipHost } from '@microsoft/office-ui-fabric-react-bundle';
31+
import { TooltipHost, ITooltipHostStyles } from 'office-ui-fabric-react/lib/Tooltip';
2832
import { useId } from '@uifabric/react-hooks';
29-
import { ITooltipHostStyles } from 'office-ui-fabric-react';
30-
import { ITermInfo,
31-
ITermSetInfo,
32-
ITermStoreInfo
33-
} from '@pnp/sp/taxonomy';
33+
import {
34+
ITermInfo,
35+
ITermSetInfo,
36+
ITermStoreInfo
37+
} from '@pnp/sp/taxonomy';
3438
import { TermItemSuggestion } from './termItem/TermItemSuggestion';
3539
import { ModernTermPicker } from './modernTermPicker/ModernTermPicker';
3640
import { IModernTermPickerProps, ITermItemProps } from './modernTermPicker/ModernTermPicker.types';
3741
import { TermItem } from './termItem/TermItem';
38-
import { IReadonlyTheme } from "@microsoft/sp-component-base";
39-
import { isUndefined } from 'lodash';
42+
import { IReadonlyTheme } from '@microsoft/sp-component-base';
4043

4144
export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
4245

@@ -75,21 +78,21 @@ export function ModernTaxonomyPicker(props: IModernTaxonomyPickerProps) {
7578
.then((termStoreInfo) => {
7679
setCurrentTermStoreInfo(termStoreInfo);
7780
setCurrentLanguageTag(props.context.pageContext.cultureInfo.currentUICultureName !== '' ?
78-
props.context.pageContext.cultureInfo.currentUICultureName :
79-
currentTermStoreInfo.defaultLanguageTag);
80-
setSelectedOptions(Object.prototype.toString.call(props.initialValues) === '[object Array]' ?
81-
props.initialValues.map(term => { return { ...term, languageTag: currentLanguageTag, termStoreInfo: currentTermStoreInfo } as ITermInfo;}) :
82-
[]);
81+
props.context.pageContext.cultureInfo.currentUICultureName :
82+
currentTermStoreInfo.defaultLanguageTag);
83+
setSelectedOptions(Array.isArray(props.initialValues) ?
84+
props.initialValues.map(term => { return { ...term, languageTag: currentLanguageTag, termStoreInfo: currentTermStoreInfo } as ITermInfo; }) :
85+
[]);
8386
});
8487
taxonomyService.getTermSetInfo(Guid.parse(props.termSetId))
8588
.then((termSetInfo) => {
8689
setCurrentTermSetInfo(termSetInfo);
8790
});
8891
if (props.anchorTermId && props.anchorTermId !== Guid.empty.toString()) {
8992
taxonomyService.getTermById(Guid.parse(props.termSetId), props.anchorTermId ? Guid.parse(props.anchorTermId) : Guid.empty)
90-
.then((anchorTermInfo) => {
91-
setCurrentAnchorTermInfo(anchorTermInfo);
92-
});
93+
.then((anchorTermInfo) => {
94+
setCurrentAnchorTermInfo(anchorTermInfo);
95+
});
9396
}
9497
}, []);
9598

@@ -184,8 +187,8 @@ export function ModernTaxonomyPicker(props: IModernTaxonomyPickerProps) {
184187
const calloutProps = { gapSpace: 0 };
185188
const tooltipId = useId('tooltip');
186189
const hostStyles: Partial<ITooltipHostStyles> = { root: { display: 'inline-block' } };
187-
const addTermButtonStyles: IButtonStyles = {rootHovered: {backgroundColor: "inherit"}, rootPressed: {backgroundColor: "inherit"}};
188-
const termPickerStyles: IStyleFunctionOrObject<IBasePickerStyleProps, IBasePickerStyles> = { input: {minheight: 34}, text: {minheight: 34} };
190+
const addTermButtonStyles: IButtonStyles = { rootHovered: { backgroundColor: 'inherit' }, rootPressed: { backgroundColor: 'inherit' } };
191+
const termPickerStyles: IStyleFunctionOrObject<IBasePickerStyleProps, IBasePickerStyles> = { input: { minheight: 34 }, text: { minheight: 34 } };
189192

190193
return (
191194
<div className={styles.modernTaxonomyPicker}>
@@ -205,7 +208,7 @@ export function ModernTaxonomyPicker(props: IModernTaxonomyPickerProps) {
205208
setSelectedPanelOptions(itms || []);
206209
}}
207210
getTextFromItem={getTextFromItem}
208-
pickerSuggestionsProps={props.termPickerProps?.pickerSuggestionsProps ?? {noResultsFoundText: strings.ModernTaxonomyPickerNoResultsFound}}
211+
pickerSuggestionsProps={props.termPickerProps?.pickerSuggestionsProps ?? { noResultsFoundText: strings.ModernTaxonomyPickerNoResultsFound }}
209212
inputProps={props.termPickerProps?.inputProps ?? {
210213
'aria-label': props.placeHolder || strings.ModernTaxonomyPickerDefaultPlaceHolder,
211214
placeholder: props.placeHolder || strings.ModernTaxonomyPickerDefaultPlaceHolder
@@ -242,8 +245,8 @@ export function ModernTaxonomyPicker(props: IModernTaxonomyPickerProps) {
242245
};
243246
return (
244247
<Stack horizontal disableShrink tokens={horizontalGapStackTokens}>
245-
<PrimaryButton text={strings.ModernTaxonomyPickerApplyButtonText} value="Apply" onClick={onApply} />
246-
<DefaultButton text={strings.ModernTaxonomyPickerCancelButtonText} value="Cancel" onClick={onClosePanel} />
248+
<PrimaryButton text={strings.ModernTaxonomyPickerApplyButtonText} value='Apply' onClick={onApply} />
249+
<DefaultButton text={strings.ModernTaxonomyPickerCancelButtonText} value='Cancel' onClick={onClosePanel} />
247250
</Stack>
248251
);
249252
}}>

‎src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
import React from "react";
2-
import { BasePicker } from "office-ui-fabric-react/lib/components/pickers/BasePicker";
1+
import React from 'react';
2+
import { BasePicker } from 'office-ui-fabric-react/lib/components/pickers/BasePicker';
33
import { IModernTermPickerProps,
44
ITermItemProps
5-
} from "./ModernTermPicker.types";
6-
import { TermItem } from "../termItem/TermItem";
7-
import { TermItemSuggestion } from "../termItem/TermItemSuggestion";
5+
} from './ModernTermPicker.types';
6+
import { TermItem } from '../termItem/TermItem';
7+
import { TermItemSuggestion } from '../termItem/TermItemSuggestion';
88
import { IBasePickerStyleProps,
99
IBasePickerStyles
10-
} from "office-ui-fabric-react/lib/components/pickers/BasePicker.types";
11-
import { getStyles } from "office-ui-fabric-react/lib/components/pickers/BasePicker.styles";
10+
} from 'office-ui-fabric-react/lib/components/pickers/BasePicker.types';
11+
import { getStyles } from 'office-ui-fabric-react/lib/components/pickers/BasePicker.styles';
1212
import { initializeComponentRef,
1313
styled
14-
} from "office-ui-fabric-react/lib/Utilities";
15-
import { ISuggestionItemProps } from "office-ui-fabric-react/lib/components/pickers/Suggestions/SuggestionsItem.types";
16-
import { ITermInfo } from "@pnp/sp/taxonomy";
14+
} from 'office-ui-fabric-react/lib/Utilities';
15+
import { ISuggestionItemProps } from 'office-ui-fabric-react/lib/components/pickers/Suggestions/SuggestionsItem.types';
16+
import { ITermInfo } from '@pnp/sp/taxonomy';
1717

1818
export class ModernTermPickerBase extends BasePicker<ITermInfo, IModernTermPickerProps> {
1919
public static defaultProps = {

‎src/controls/modernTaxonomyPicker/modernTermPicker/ModernTermPicker.types.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { ITermInfo, ITermStoreInfo } from "@pnp/sp/taxonomy";
2-
import { IBasePickerProps } from "office-ui-fabric-react/lib/components/pickers/BasePicker.types";
3-
import { IPickerItemProps } from "office-ui-fabric-react/lib/components/pickers/PickerItem.types";
4-
import { IStyle, ITheme } from "office-ui-fabric-react/lib/Styling";
5-
import { IStyleFunctionOrObject } from "office-ui-fabric-react/lib/Utilities";
6-
import { IReadonlyTheme } from "@microsoft/sp-component-base";
1+
import { ITermInfo, ITermStoreInfo } from '@pnp/sp/taxonomy';
2+
import { IBasePickerProps } from 'office-ui-fabric-react/lib/components/pickers/BasePicker.types';
3+
import { IPickerItemProps } from 'office-ui-fabric-react/lib/components/pickers/PickerItem.types';
4+
import { IStyle, ITheme } from 'office-ui-fabric-react/lib/Styling';
5+
import { IStyleFunctionOrObject } from 'office-ui-fabric-react/lib/Utilities';
6+
import { IReadonlyTheme } from '@microsoft/sp-component-base';
77

88
export interface IModernTermPickerProps extends IBasePickerProps<ITermInfo> {
99
themeVariant?: IReadonlyTheme;

0 commit comments

Comments
 (0)