Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b260f741d5 | ||
| 7655759bbc | |||
| d30b98c987 | |||
|
|
70d6f6ff42 | ||
| 97f0a15ae2 | |||
| 4cf19131bf | |||
|
|
83137c92a9 | ||
| 426ddf5650 | |||
| 7800e7ced7 |
@@ -1,3 +1,5 @@
|
||||
{
|
||||
"dependencies": {}
|
||||
"dependencies": {
|
||||
"@capacitor/status-bar": "8.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ import { RoomTimeline } from './RoomTimeline';
|
||||
import { RoomViewTyping } from './RoomViewTyping';
|
||||
import { RoomTombstone } from './RoomTombstone';
|
||||
import { RoomInput } from './RoomInput';
|
||||
import { RoomViewFollowing } from './RoomViewFollowing';
|
||||
import { RoomViewFollowing, RoomViewFollowingPlaceholder } from './RoomViewFollowing';
|
||||
import { Page } from '../../components/page';
|
||||
import { RoomViewHeader } from './RoomViewHeader';
|
||||
import { useKeyDown } from '../../hooks/useKeyDown';
|
||||
@@ -65,7 +65,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||
const roomViewRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const { isLandscape, keyboardOpen } = useMobileKeyboardLayout();
|
||||
const { immersive } = useMobileKeyboardLayout();
|
||||
|
||||
const { roomId } = room;
|
||||
const editor = useEditor();
|
||||
@@ -104,9 +104,9 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||
)
|
||||
);
|
||||
|
||||
const flushComposer = keyboardOpen || isLandscape;
|
||||
const flushComposer = immersive;
|
||||
const composerPadding = flushComposer ? '0' : `0 ${config.space.S400}`;
|
||||
const showHeader = !keyboardOpen;
|
||||
const showHeader = !immersive;
|
||||
|
||||
return (
|
||||
<Page ref={roomViewRef}>
|
||||
@@ -134,7 +134,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||
data-composer-flush={flushComposer ? 'true' : undefined}
|
||||
className={composerCss.ComposerDock}
|
||||
>
|
||||
{!hideActivity && (
|
||||
{immersive && !hideActivity && (
|
||||
<div className={composerCss.FollowingFloat}>
|
||||
<div className={composerCss.FollowingFloatHit}>
|
||||
<RoomViewFollowing room={room} />
|
||||
@@ -171,6 +171,12 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
{!immersive &&
|
||||
(hideActivity ? (
|
||||
<RoomViewFollowingPlaceholder />
|
||||
) : (
|
||||
<RoomViewFollowing room={room} />
|
||||
))}
|
||||
</Box>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import { style } from '@vanilla-extract/css';
|
||||
import { recipe } from '@vanilla-extract/recipes';
|
||||
import { DefaultReset, color, config } from 'folds';
|
||||
import { DefaultReset, color, config, toRem } from 'folds';
|
||||
|
||||
export const RoomViewFollowingPlaceholder = style([
|
||||
DefaultReset,
|
||||
{
|
||||
display: 'none',
|
||||
height: 0,
|
||||
height: toRem(28),
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -14,13 +13,22 @@ export const RoomViewFollowing = recipe({
|
||||
base: [
|
||||
DefaultReset,
|
||||
{
|
||||
minHeight: 0,
|
||||
padding: `${config.space.S100} ${config.space.S200}`,
|
||||
width: 'auto',
|
||||
maxWidth: '100%',
|
||||
backgroundColor: 'transparent',
|
||||
minHeight: toRem(28),
|
||||
padding: `0 ${config.space.S400}`,
|
||||
width: '100%',
|
||||
backgroundColor: color.Surface.Container,
|
||||
color: color.Surface.OnContainer,
|
||||
outline: 'none',
|
||||
selectors: {
|
||||
// Compact floating chip while the keyboard is open.
|
||||
'[data-composer-flush="true"] &': {
|
||||
minHeight: 0,
|
||||
width: 'auto',
|
||||
maxWidth: '100%',
|
||||
padding: `${config.space.S100} ${config.space.S200}`,
|
||||
backgroundColor: 'transparent',
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
variants: {
|
||||
|
||||
79
overlay/src/app/hooks/useFilePasteHandler.ts
Normal file
79
overlay/src/app/hooks/useFilePasteHandler.ts
Normal file
@@ -0,0 +1,79 @@
|
||||
import { useCallback, ClipboardEventHandler } from 'react';
|
||||
import { getDataTransferFiles } from '../utils/dom';
|
||||
import { readClipboardImage, isTauri, isLinux } from '../utils/tauri';
|
||||
|
||||
const filesFromClipboardItems = (data: DataTransfer | null): File[] => {
|
||||
if (!data?.items) return [];
|
||||
|
||||
const files: File[] = [];
|
||||
for (let i = 0; i < data.items.length; i += 1) {
|
||||
const item = data.items[i];
|
||||
if (item.kind !== 'file') continue;
|
||||
const file = item.getAsFile();
|
||||
if (file) files.push(file);
|
||||
}
|
||||
return files;
|
||||
};
|
||||
|
||||
const filesFromHtmlImage = (data: DataTransfer | null): File[] => {
|
||||
const html = data?.getData('text/html');
|
||||
if (!html) return [];
|
||||
|
||||
const match = html.match(/<img[^>]+src=["'](data:image\/[a-zA-Z+]+;base64,[^"']+)["']/i);
|
||||
if (!match?.[1]) return [];
|
||||
|
||||
try {
|
||||
const dataUrl = match[1];
|
||||
const [meta, base64] = dataUrl.split(',');
|
||||
const mime = meta.match(/data:(image\/[a-zA-Z+]+);base64/i)?.[1] ?? 'image/png';
|
||||
const binary = atob(base64);
|
||||
const bytes = new Uint8Array(binary.length);
|
||||
for (let i = 0; i < binary.length; i += 1) {
|
||||
bytes[i] = binary.charCodeAt(i);
|
||||
}
|
||||
const ext = mime.split('/')[1]?.replace('+xml', '') || 'png';
|
||||
return [new File([bytes], `clipboard-image.${ext}`, { type: mime })];
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
};
|
||||
|
||||
const getClipboardFiles = (data: DataTransfer | null): File[] => {
|
||||
if (!data) return [];
|
||||
|
||||
const fromFiles = getDataTransferFiles(data);
|
||||
if (fromFiles && fromFiles.length > 0) return fromFiles;
|
||||
|
||||
const fromItems = filesFromClipboardItems(data);
|
||||
if (fromItems.length > 0) return fromItems;
|
||||
|
||||
return filesFromHtmlImage(data);
|
||||
};
|
||||
|
||||
/**
|
||||
* Paste handler for RoomInput. Supports clipboard images via files, DataTransferItem
|
||||
* list, and HTML data-URL fallbacks (common on mobile WebViews).
|
||||
*/
|
||||
export const useFilePasteHandler = (onPaste: (file: File[]) => void): ClipboardEventHandler =>
|
||||
useCallback(
|
||||
async (evt) => {
|
||||
const files = getClipboardFiles(evt.clipboardData);
|
||||
if (files.length > 0) {
|
||||
evt.preventDefault();
|
||||
evt.stopPropagation();
|
||||
onPaste(files);
|
||||
return;
|
||||
}
|
||||
|
||||
// On Linux with Tauri, browser clipboard API doesn't work for images.
|
||||
if (isTauri() && isLinux()) {
|
||||
const clipboardImage = await readClipboardImage();
|
||||
if (clipboardImage) {
|
||||
evt.preventDefault();
|
||||
evt.stopPropagation();
|
||||
onPaste([clipboardImage]);
|
||||
}
|
||||
}
|
||||
},
|
||||
[onPaste]
|
||||
);
|
||||
@@ -1,6 +1,8 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { isCapacitorNative } from '../utils/tauri';
|
||||
|
||||
const KEYBOARD_HEIGHT_THRESHOLD_PX = 120;
|
||||
const IMMERSIVE_CLASS = 'immersive-landscape-keyboard';
|
||||
|
||||
const getIsLandscape = (): boolean => {
|
||||
if (typeof window === 'undefined') return false;
|
||||
@@ -24,9 +26,25 @@ const getKeyboardOpen = (): boolean => {
|
||||
return tag === 'INPUT' || tag === 'TEXTAREA';
|
||||
};
|
||||
|
||||
const setNativeStatusBarHidden = async (hidden: boolean) => {
|
||||
if (!isCapacitorNative()) return;
|
||||
try {
|
||||
const { StatusBar } = await import('@capacitor/status-bar');
|
||||
if (hidden) {
|
||||
await StatusBar.hide();
|
||||
} else {
|
||||
await StatusBar.show();
|
||||
}
|
||||
} catch {
|
||||
// Plugin may be missing in some builds; CSS safe-area collapse still applies.
|
||||
}
|
||||
};
|
||||
|
||||
export type MobileKeyboardLayout = {
|
||||
isLandscape: boolean;
|
||||
keyboardOpen: boolean;
|
||||
/** Landscape + keyboard: compact immersive room chrome. */
|
||||
immersive: boolean;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -37,6 +55,8 @@ export const useMobileKeyboardLayout = (): MobileKeyboardLayout => {
|
||||
const [isLandscape, setIsLandscape] = useState(getIsLandscape);
|
||||
const [keyboardOpen, setKeyboardOpen] = useState(getKeyboardOpen);
|
||||
|
||||
const immersive = isLandscape && keyboardOpen;
|
||||
|
||||
useEffect(() => {
|
||||
const sync = () => {
|
||||
setIsLandscape(getIsLandscape());
|
||||
@@ -63,5 +83,15 @@ export const useMobileKeyboardLayout = (): MobileKeyboardLayout => {
|
||||
};
|
||||
}, []);
|
||||
|
||||
return { isLandscape, keyboardOpen };
|
||||
useEffect(() => {
|
||||
document.documentElement.classList.toggle(IMMERSIVE_CLASS, immersive);
|
||||
void setNativeStatusBarHidden(immersive);
|
||||
|
||||
return () => {
|
||||
document.documentElement.classList.remove(IMMERSIVE_CLASS);
|
||||
void setNativeStatusBarHidden(false);
|
||||
};
|
||||
}, [immersive]);
|
||||
|
||||
return { isLandscape, keyboardOpen, immersive };
|
||||
};
|
||||
|
||||
@@ -9,11 +9,11 @@ type ClientLayoutProps = {
|
||||
};
|
||||
|
||||
export function ClientLayout({ nav, children }: ClientLayoutProps) {
|
||||
const { keyboardOpen } = useMobileKeyboardLayout();
|
||||
const { immersive } = useMobileKeyboardLayout();
|
||||
|
||||
return (
|
||||
<Box grow="Yes">
|
||||
{!keyboardOpen && <Box shrink="No">{nav}</Box>}
|
||||
{!immersive && <Box shrink="No">{nav}</Box>}
|
||||
<Box grow="Yes">{children}</Box>
|
||||
<DockedCallPanel />
|
||||
</Box>
|
||||
|
||||
@@ -97,6 +97,11 @@ body {
|
||||
font-variant-ligatures: no-contextual;
|
||||
}
|
||||
|
||||
/* Landscape + keyboard: reclaim status-bar inset while chrome is hidden. */
|
||||
html.immersive-landscape-keyboard {
|
||||
--safe-area-inset-top: 0px;
|
||||
}
|
||||
|
||||
/* Prevent zalgo text and combining diacritics from overflowing line boundaries */
|
||||
p, span, div, a, button, li, td, th, h1, h2, h3, h4, h5, h6 {
|
||||
line-height: 1.5;
|
||||
|
||||
16
package-lock.json
generated
16
package-lock.json
generated
@@ -1,18 +1,19 @@
|
||||
{
|
||||
"name": "paarrot",
|
||||
"version": "4.11.77",
|
||||
"version": "4.11.121",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "paarrot",
|
||||
"version": "4.11.77",
|
||||
"version": "4.11.121",
|
||||
"license": "AGPL-3.0-only",
|
||||
"dependencies": {
|
||||
"@capacitor/android": "8.3.0",
|
||||
"@capacitor/cli": "8.3.0",
|
||||
"@capacitor/core": "8.3.0",
|
||||
"@capacitor/local-notifications": "8.0.2"
|
||||
"@capacitor/local-notifications": "8.0.2",
|
||||
"@capacitor/status-bar": "8.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"node-fetch": "3.3.2",
|
||||
@@ -82,6 +83,15 @@
|
||||
"@capacitor/core": ">=8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@capacitor/status-bar": {
|
||||
"version": "8.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-8.0.1.tgz",
|
||||
"integrity": "sha512-OR59dlbwvmrV5dKsC9lvwv48QaGbqcbSTBpk+9/WXWxXYSdXXdzJZU9p8oyNPAkuJhCdnSa3XmU43fZRPBJJ5w==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"@capacitor/core": ">=8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@emnapi/runtime": {
|
||||
"version": "1.8.1",
|
||||
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "paarrot",
|
||||
"version": "4.11.121",
|
||||
"version": "4.11.124",
|
||||
"description": "Paarrot - A Matrix client based on Cinny",
|
||||
"engines": {
|
||||
"node": ">=18.0.0"
|
||||
@@ -25,7 +25,8 @@
|
||||
"@capacitor/android": "8.3.0",
|
||||
"@capacitor/cli": "8.3.0",
|
||||
"@capacitor/core": "8.3.0",
|
||||
"@capacitor/local-notifications": "8.0.2"
|
||||
"@capacitor/local-notifications": "8.0.2",
|
||||
"@capacitor/status-bar": "8.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"node-fetch": "3.3.2",
|
||||
|
||||
Reference in New Issue
Block a user