diff --git a/change/@fluentui-react-file-type-icons-9fe66364-8cea-40ec-a385-ea3a45b93c41.json b/change/@fluentui-react-file-type-icons-9fe66364-8cea-40ec-a385-ea3a45b93c41.json new file mode 100644 index 00000000000000..b99ffca54d66b2 --- /dev/null +++ b/change/@fluentui-react-file-type-icons-9fe66364-8cea-40ec-a385-ea3a45b93c41.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Support for new markdown, \"special folder\" filetype icon (default \"shortcuts\" folder) and other fixes", + "packageName": "@fluentui/react-file-type-icons", + "email": "caperez@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-style-utilities-854197df-5809-4b91-b7af-acbc2565bbb1.json b/change/@fluentui-style-utilities-854197df-5809-4b91-b7af-acbc2565bbb1.json new file mode 100644 index 00000000000000..e57ba23efe640f --- /dev/null +++ b/change/@fluentui-style-utilities-854197df-5809-4b91-b7af-acbc2565bbb1.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Updated OneCDN url to latest version (adding support for new markdown, \"shortcuts folder\" filetype icon and other fixes)", + "packageName": "@fluentui/style-utilities", + "email": "caperez@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-file-type-icons/src/FileIconType.ts b/packages/react-file-type-icons/src/FileIconType.ts index d488adab0c5edd..82fcf73b3215e8 100644 --- a/packages/react-file-type-icons/src/FileIconType.ts +++ b/packages/react-file-type-icons/src/FileIconType.ts @@ -29,6 +29,7 @@ export enum FileIconType { album = 21, listForm = 22, campaign = 23, + shortcutsdefaultfolder = 24, } export type FileIconTypeInput = @@ -54,4 +55,5 @@ export type FileIconTypeInput = | 20 | 21 | 22 - | 23; + | 23 + | 24; diff --git a/packages/react-file-type-icons/src/FileTypeIconMap.ts b/packages/react-file-type-icons/src/FileTypeIconMap.ts index e95fbe5c5db58f..fa9cfbf59f7ffc 100644 --- a/packages/react-file-type-icons/src/FileTypeIconMap.ts +++ b/packages/react-file-type-icons/src/FileTypeIconMap.ts @@ -263,10 +263,14 @@ export const FileTypeIconMap: { [key: string]: { extensions?: string[] } } = { copilot: { extensions: ['copilot'], }, + cowork: { + extensions: ['work'], + }, /* css: {}, not broken out yet, snapping to 'code' for now */ csv: { extensions: ['csv'], }, + companyfolder: {}, designer: { extensions: ['design'], }, @@ -298,6 +302,9 @@ export const FileTypeIconMap: { [key: string]: { extensions?: string[] } } = { ipynb: { extensions: ['nnb', 'ipynb'], }, + inkcanvas: { + extensions: ['canvas'], + }, link: { extensions: ['lnk', 'link', 'url', 'website', 'webloc'], }, @@ -315,6 +322,9 @@ export const FileTypeIconMap: { [key: string]: { extensions?: string[] } } = { mcworld: { extensions: ['mcworld'], }, + md: { + extensions: ['md', 'markdn', 'markdown', 'mdown', 'mkdn'], + }, mctemplate: { extensions: ['mctemplate'], }, @@ -444,7 +454,7 @@ export const FileTypeIconMap: { [key: string]: { extensions?: string[] } } = { extensions: ['odc', 'ods', 'gsheet', 'numbers', 'tsv'], }, rtf: { - extensions: ['epub', 'gdoc', 'odt', 'md', 'markdn', 'markdown', 'mdown', 'mkdn', 'rtf', 'wri', 'pages'], + extensions: ['epub', 'gdoc', 'odt', 'rtf', 'wri', 'pages'], }, sharedfolder: {}, playlist: {}, diff --git a/packages/react-file-type-icons/src/getFileTypeIconProps.ts b/packages/react-file-type-icons/src/getFileTypeIconProps.ts index f53ecc96cdd598..295036d48cb207 100644 --- a/packages/react-file-type-icons/src/getFileTypeIconProps.ts +++ b/packages/react-file-type-icons/src/getFileTypeIconProps.ts @@ -27,6 +27,7 @@ const PORTFOLIO = 'portfolio'; const ALBUM = 'album'; const LIST_FORM = 'listform'; const CAMPAIGN = 'spocampaign'; +const SHORTCUTS_DEFAULT_FOLDER = 'companyfolder'; export const DEFAULT_ICON_SIZE: FileTypeIconSize = 16; export type FileTypeIconSize = 16 | 20 | 24 | 32 | 40 | 48 | 64 | 96; @@ -171,6 +172,9 @@ export function getFileTypeIconNameFromExtensionOrType( case FileIconType.campaign: iconBaseName = CAMPAIGN; break; + case FileIconType.shortcutsdefaultfolder: + iconBaseName = SHORTCUTS_DEFAULT_FOLDER; + break; } } return iconBaseName || GENERIC_FILE; diff --git a/packages/style-utilities/etc/style-utilities.api.md b/packages/style-utilities/etc/style-utilities.api.md index 046fe7c6c5b57e..5eb702216ec06d 100644 --- a/packages/style-utilities/etc/style-utilities.api.md +++ b/packages/style-utilities/etc/style-utilities.api.md @@ -85,7 +85,7 @@ export { DefaultPalette } export const EdgeChromiumHighContrastSelector = "@media screen and (-ms-high-contrast: active), screen and (forced-colors: active)"; // @public (undocumented) -export const FLUENT_CDN_BASE_URL = "https://res.cdn.office.net/files/fabric-cdn-prod_20260115.001"; +export const FLUENT_CDN_BASE_URL = "https://res.cdn.office.net/files/fabric-cdn-prod_20260506.001"; // @public export function focusClear(): IRawStyle; diff --git a/packages/style-utilities/src/cdn.ts b/packages/style-utilities/src/cdn.ts index c92032b59c6d4c..163885209cb4f6 100644 --- a/packages/style-utilities/src/cdn.ts +++ b/packages/style-utilities/src/cdn.ts @@ -1 +1 @@ -export const FLUENT_CDN_BASE_URL = 'https://res.cdn.office.net/files/fabric-cdn-prod_20260115.001'; +export const FLUENT_CDN_BASE_URL = 'https://res.cdn.office.net/files/fabric-cdn-prod_20260506.001';