Skip to content

Commit 8f868df

Browse files
Merge pull request #1389 from joaojmendes/SitePickerChanges
Site picker changes
2 parents f59ed4a + f920d11 commit 8f868df

File tree

3 files changed

+58
-10
lines changed

3 files changed

+58
-10
lines changed

package-lock.json

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controls/sitePicker/ISitePicker.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
import { IDropdownStyles } from 'office-ui-fabric-react';
2+
13
import { BaseComponentContext } from '@microsoft/sp-component-base';
4+
25
import { ISite } from '../../services/SPSitesService';
36

47
export interface ISitePickerProps {
@@ -95,4 +98,6 @@ export interface ISitePickerProps {
9598
* If mode is set to associatedsites and no hubsiteId is provided, the current site's hub ID will be used.
9699
*/
97100
hubsiteId?: string;
101+
styles?: IDropdownStyles ;
98102
}
103+
export { ISite };

src/controls/sitePicker/SitePicker.tsx

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
import { Async } from '@uifabric/utilities/lib/Async';
1+
import * as React from 'react';
2+
23
import findIndex from 'lodash/findIndex';
34
import orderBy from 'lodash/orderBy';
4-
import { Dropdown, IDropdownOption } from 'office-ui-fabric-react/lib/Dropdown';
5+
import {
6+
Dropdown,
7+
IDropdownOption,
8+
} from 'office-ui-fabric-react/lib/Dropdown';
59
import { SearchBox } from 'office-ui-fabric-react/lib/SearchBox';
6-
import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
10+
import {
11+
Spinner,
12+
SpinnerSize,
13+
} from 'office-ui-fabric-react/lib/Spinner';
714
import { mergeStyleSets } from 'office-ui-fabric-react/lib/Styling';
8-
import { ISelectableOption, SelectableOptionMenuItemType } from 'office-ui-fabric-react/lib/utilities/selectableOption/SelectableOption.types';
9-
import * as React from 'react';
15+
import {
16+
ISelectableOption,
17+
SelectableOptionMenuItemType,
18+
} from 'office-ui-fabric-react/lib/utilities/selectableOption/SelectableOption.types';
19+
20+
import { Async } from '@uifabric/utilities/lib/Async';
1021

1122
import * as telemetry from '../../common/telemetry';
1223
import { toRelativeUrl } from '../../common/utilities/GeneralHelper';
13-
import { getAllSites, getHubSites, ISite, getAssociatedSites } from '../../services/SPSitesService';
14-
import { ISitePickerProps } from './ISitePicker';
24+
import {
25+
getAllSites,
26+
getAssociatedSites,
27+
getHubSites,
28+
} from '../../services/SPSitesService';
29+
import {
30+
ISite,
31+
ISitePickerProps,
32+
} from './ISitePicker';
1533

1634
const styles = mergeStyleSets({
1735
loadingSpinnerContainer: {
@@ -73,7 +91,7 @@ export const SitePicker: React.FunctionComponent<ISitePickerProps> = (props: Rea
7391
className,
7492
selectedSites,
7593
trimDuplicates,
76-
additionalQuery,
94+
additionalQuery,
7795
hubsiteId
7896
} = props;
7997

@@ -238,11 +256,11 @@ export const SitePicker: React.FunctionComponent<ISitePickerProps> = (props: Rea
238256
case 'hub':
239257
promise = getHubSites(context);
240258
break;
241-
259+
242260
case 'associatedsites':
243261
promise = getAssociatedSites(context, trimDuplicates === true, hubsiteId);
244262
break;
245-
263+
246264
default:
247265
promise = getAllSites(context, mode !== 'site', limitToCurrentSiteCollection, trimDuplicates === true, additionalQuery);
248266
break;
@@ -291,6 +309,7 @@ export const SitePicker: React.FunctionComponent<ISitePickerProps> = (props: Rea
291309
onChange={onSelectionChange}
292310
notifyOnReselect={true}
293311
className={className}
312+
styles={props.styles}
294313
/>
295314
</>
296315
);

0 commit comments

Comments
 (0)