diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c66ace6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,22 @@ +{ + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#ab307e", + "activityBar.activeBorder": "#25320e", + "activityBar.background": "#ab307e", + "activityBar.foreground": "#e7e7e7", + "activityBar.inactiveForeground": "#e7e7e799", + "activityBarBadge.background": "#25320e", + "activityBarBadge.foreground": "#e7e7e7", + "statusBar.background": "#832561", + "statusBar.foreground": "#e7e7e7", + "statusBarItem.hoverBackground": "#ab307e", + "titleBar.activeBackground": "#832561", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveBackground": "#83256199", + "titleBar.inactiveForeground": "#e7e7e799", + "sash.hoverBorder": "#ab307e", + "statusBarItem.remoteBackground": "#832561", + "statusBarItem.remoteForeground": "#e7e7e7" + }, + "peacock.color": "#832561" +} \ No newline at end of file diff --git a/ColorfulOptionsetGrid/App/ColorfulGrid.tsx b/ColorfulOptionsetGrid/App/ColorfulGrid.tsx index 7ce56a7..764b6d4 100644 --- a/ColorfulOptionsetGrid/App/ColorfulGrid.tsx +++ b/ColorfulOptionsetGrid/App/ColorfulGrid.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import {DetailsList, IColumn, DetailsListLayoutMode, IDetailsHeaderProps, SelectionMode} from '@fluentui/react/lib/DetailsList'; +import {DetailsList, IColumn, DetailsListLayoutMode, IDetailsHeaderProps, SelectionMode, ConstrainMode} from '@fluentui/react/lib/DetailsList'; import {mergeStyles, DefaultFontStyles } from '@fluentui/react/lib/Styling'; import {initializeIcons} from '@fluentui/react/lib/Icons'; import {ScrollablePane} from '@fluentui/react/lib/ScrollablePane'; @@ -84,7 +84,7 @@ export const ColorfulGrid = React.memo(function ColorfulGridApp({ const isOptionSetRenderer : boolean = metadataAttributes?.has(column.original.name); const columnDefaultIcon = displayIconType==="NAME" ? defaultIconNames.get(column.original.name)??defaultIcon : defaultIcon; return { - ...getDefaultColumnSetup(column, dataset), + ...getDefaultColumnSetup(column, dataset), onRender: isOptionSetRenderer===true ? (item : any) => { return ; } - const icon = metadataOptions?.get(currentOptionSetValue?.toString() ?? "")?.icon ?? defaultIcon; - const iconColor = displayTextType==="BOX" ? "white" : color; - const renderIcon = displayIconType!=="NONE" ?