mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-17 04:34:00 +02:00
Code Issues Releases Wiki Activity

Test for WebKit based browsers instead of Safari (#5437)

Browse Source 
* Test for WebKit based browsers instead of Safari

* Add changeset
This commit is contained in:
Joseph Rollins
2023-05-31 05:13:03 -07:00
committed by GitHub
parent ad126705ba
commit 3ad13d6015
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/six-dryers-raise.md Normal file
View File

@@ -0,0 +1,5 @@
---
'slate-react': minor
---
Detect all WebKit based browsers for COMPAT behavior

10
packages/slate-react/src/components/editable.tsx
View File

@@ -46,7 +46,7 @@ import {
IS_FIREFOX, IS_FIREFOX,
IS_FIREFOX_LEGACY, IS_FIREFOX_LEGACY,
IS_IOS, IS_IOS,
IS_SAFARI, IS_WEBKIT,
IS_UC_MOBILE, IS_UC_MOBILE,
IS_WECHATBROWSER, IS_WECHATBROWSER,
} from '../utils/environment' } from '../utils/environment'
@@ -1014,7 +1014,7 @@ export const Editable = (props: EditableProps) => {
// COMPAT: Safari doesn't always remove the selection even if the content- // COMPAT: Safari doesn't always remove the selection even if the content-
// editable element no longer has focus. Refer to: // editable element no longer has focus. Refer to:
// https://stackoverflow.com/questions/12353247/force-contenteditable-div-to-stop-accepting-input-after-it-loses-focus-under-web // https://stackoverflow.com/questions/12353247/force-contenteditable-div-to-stop-accepting-input-after-it-loses-focus-under-web
if (IS_SAFARI) { if (IS_WEBKIT) {
const domSelection = root.getSelection() const domSelection = root.getSelection()
domSelection?.removeAllRanges() domSelection?.removeAllRanges()
} }
@@ -1112,7 +1112,7 @@ export const Editable = (props: EditableProps) => {
// type that we need. So instead, insert whenever a composition // type that we need. So instead, insert whenever a composition
// ends since it will already have been committed to the DOM. // ends since it will already have been committed to the DOM.
if ( if (
!IS_SAFARI && !IS_WEBKIT &&
!IS_FIREFOX_LEGACY && !IS_FIREFOX_LEGACY &&
!IS_IOS && !IS_IOS &&
!IS_WECHATBROWSER && !IS_WECHATBROWSER &&
@@ -1621,7 +1621,7 @@ export const Editable = (props: EditableProps) => {
return return
} }
} else { } else {
if (IS_CHROME || IS_SAFARI) { if (IS_CHROME || IS_WEBKIT) {
// COMPAT: Chrome and Safari support `beforeinput` event but do not fire // COMPAT: Chrome and Safari support `beforeinput` event but do not fire
// an event when deleting backwards in a selected void inline node // an event when deleting backwards in a selected void inline node
if ( if (
@@ -1670,7 +1670,7 @@ export const Editable = (props: EditableProps) => {
if ( if (
!HAS_BEFORE_INPUT_SUPPORT || !HAS_BEFORE_INPUT_SUPPORT ||
isPlainTextOnlyPaste(event.nativeEvent) || isPlainTextOnlyPaste(event.nativeEvent) ||
IS_SAFARI IS_WEBKIT
) { ) {
event.preventDefault() event.preventDefault()
ReactEditor.insertData(editor, event.clipboardData) ReactEditor.insertData(editor, event.clipboardData)

4
packages/slate-react/src/components/leaf.tsx
View File

@@ -15,7 +15,7 @@ import {
} from '../utils/weak-maps' } from '../utils/weak-maps'
import { RenderLeafProps, RenderPlaceholderProps } from './editable' import { RenderLeafProps, RenderPlaceholderProps } from './editable'
import { useSlateStatic } from '../hooks/use-slate-static' import { useSlateStatic } from '../hooks/use-slate-static'
import { IS_SAFARI } from '../utils/environment' import { IS_WEBKIT } from '../utils/environment'
function disconnectPlaceholderResizeObserver( function disconnectPlaceholderResizeObserver(
placeholderResizeObserver: MutableRefObject<ResizeObserver | null>, placeholderResizeObserver: MutableRefObject<ResizeObserver | null>,
@@ -128,7 +128,7 @@ const Leaf = (props: {
userSelect: 'none', userSelect: 'none',
textDecoration: 'none', textDecoration: 'none',
// Fixes https://github.com/udecode/plate/issues/2315 // Fixes https://github.com/udecode/plate/issues/2315
WebkitUserModify: IS_SAFARI ? 'inherit' : undefined, WebkitUserModify: IS_WEBKIT ? 'inherit' : undefined,
}, },
contentEditable: false, contentEditable: false,
ref: callbackPlaceholderRef, ref: callbackPlaceholderRef,

5
packages/slate-react/src/utils/environment.ts
View File

@@ -19,9 +19,8 @@ export const IS_FIREFOX =
typeof navigator !== 'undefined' && typeof navigator !== 'undefined' &&
/^(?!.*Seamonkey)(?=.*Firefox).*/i.test(navigator.userAgent) /^(?!.*Seamonkey)(?=.*Firefox).*/i.test(navigator.userAgent)
export const IS_SAFARI = export const IS_WEBKIT =
typeof navigator !== 'undefined' && typeof navigator !== 'undefined' && /AppleWebKit/.test(navigator.userAgent)
/Version\/[\d\.]+.*Safari/.test(navigator.userAgent)
// "modern" Edge was released at 79.x // "modern" Edge was released at 79.x
export const IS_EDGE_LEGACY = export const IS_EDGE_LEGACY =