Skip to content

Commit e425355

Browse files
authored
Update "isSafari" detection to work across Apple platforms (#3232)
* Update Safari detection logic in createEditorCore * Update isSafari detection in corresponding tests
1 parent 3cd8ef4 commit e425355

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

packages/roosterjs-content-model-core/lib/editor/core/createEditorCore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function createEditorEnvironment(
7575
isAndroid: /android/i.test(userAgent),
7676
isIOS: /iPad|iPhone/.test(userAgent),
7777
isSafari:
78-
userAgent.indexOf('Safari') >= 0 &&
78+
userAgent.indexOf('AppleWebKit') >= 0 &&
7979
userAgent.indexOf('Chrome') < 0 &&
8080
userAgent.indexOf('Android') < 0,
8181
isMobileOrTablet: getIsMobileOrTablet(userAgent),

packages/roosterjs-content-model-core/test/editor/core/createEditorCoreTest.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ describe('createEditorCore', () => {
240240
ownerDocument: {
241241
defaultView: {
242242
navigator: {
243-
userAgent: 'Android Safari',
243+
userAgent: 'Android AppleWebKit',
244244
},
245245
},
246246
},
@@ -310,7 +310,7 @@ describe('createEditorCore', () => {
310310
ownerDocument: {
311311
defaultView: {
312312
navigator: {
313-
userAgent: 'Safari',
313+
userAgent: 'AppleWebKit',
314314
},
315315
},
316316
},
@@ -345,7 +345,7 @@ describe('createEditorCore', () => {
345345
ownerDocument: {
346346
defaultView: {
347347
navigator: {
348-
userAgent: 'Safari Chrome',
348+
userAgent: 'AppleWebKit Chrome',
349349
},
350350
},
351351
},
@@ -396,7 +396,7 @@ describe('createEditorCore', () => {
396396
isMac: false,
397397
isAndroid: false,
398398
isIOS: true,
399-
isSafari: false,
399+
isSafari: true,
400400
isMobileOrTablet: true,
401401
domToModelSettings: mockedDomToModelSettings,
402402
modelToDomSettings: mockedModelToDomSettings,

0 commit comments

Comments
 (0)