mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-21 09:31:17 -08:00
feat(mobile): haptics, iOS keyboard inset, composer scroll, hardware back button
This commit is contained in:
1 parent
45558f7a90
commit
e8c8d4b4f0
2 files changed
+19
-2
No files matched your search
@@ -22,6 +22,7 @@ class MainActivity : TauriActivity() {
|
||||
// Route the hardware back button through the web app (see onWebViewCreate).
|
||||
override val handleBackNavigation: Boolean = false
|
||||
private var webView: WebView? = null
|
||||
private var handlingBack = false
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
enableEdgeToEdge()
|
||||
@@ -121,15 +122,18 @@ class MainActivity : TauriActivity() {
|
||||
this,
|
||||
object : OnBackPressedCallback(true) {
|
||||
override fun handleOnBackPressed() {
|
||||
if (handlingBack) return
|
||||
val wv = this@MainActivity.webView
|
||||
if (wv == null) {
|
||||
moveTaskToBack(true)
|
||||
return
|
||||
}
|
||||
handlingBack = true
|
||||
// If the web app didn't consume the back press, background the app.
|
||||
wv.evaluateJavascript(
|
||||
"(typeof window.__sableAndroidBack === 'function' && window.__sableAndroidBack() === true)"
|
||||
) { result ->
|
||||
handlingBack = false
|
||||
if (result != "true") moveTaskToBack(true)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,6 +116,7 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
]);
|
||||
const rootRef = useRef<HTMLDivElement | null>(null);
|
||||
const editableRef = useRef<HTMLDivElement>(null);
|
||||
const focusScrollTimerRef = useRef<number>();
|
||||
const rowRef = useRef<HTMLDivElement>(null);
|
||||
const beforeRef = useRef<HTMLDivElement>(null);
|
||||
const afterRef = useRef<HTMLDivElement>(null);
|
||||
@@ -317,6 +318,12 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
[]
|
||||
);
|
||||
|
||||
const cancelFocusScroll = useCallback(() => {
|
||||
window.clearTimeout(focusScrollTimerRef.current);
|
||||
}, []);
|
||||
|
||||
useEffect(() => cancelFocusScroll, [cancelFocusScroll]);
|
||||
|
||||
const queueMultilineMeasurement = useCallback(
|
||||
(resetRetry = true) => {
|
||||
if (multilineMeasureFrameRef.current !== null) {
|
||||
@@ -456,6 +463,7 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
enterKeyHint={enterKeyHint}
|
||||
// keeps focus after pressing send, but yields to another editor.
|
||||
onBlur={(evt) => {
|
||||
cancelFocusScroll();
|
||||
if (!mobileOrTablet()) return;
|
||||
if (suppressBlurRefocusRef?.current) return;
|
||||
const next = evt.relatedTarget as HTMLElement | null;
|
||||
@@ -466,9 +474,14 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
|
||||
// not left hidden behind it.
|
||||
onFocus={() => {
|
||||
if (!mobileOrTablet()) return;
|
||||
const scrollIn = () => rootRef.current?.scrollIntoView({ block: 'nearest' });
|
||||
cancelFocusScroll();
|
||||
const scrollIn = () => {
|
||||
if (editableRef.current?.contains(document.activeElement)) {
|
||||
rootRef.current?.scrollIntoView({ block: 'nearest' });
|
||||
}
|
||||
};
|
||||
window.visualViewport?.addEventListener('resize', scrollIn, { once: true });
|
||||
window.setTimeout(scrollIn, 500);
|
||||
focusScrollTimerRef.current = window.setTimeout(scrollIn, 500);
|
||||
}}
|
||||
style={{ boxShadow: 'none' }}
|
||||
/>
|
||||
|
||||
Reference in new issue
Block a user