Skip to content

Commit 55463fe

Browse files
KeavonKeavon
committed
Refactor platform detection to use import.meta.env.MODE instead of isPlatformNative()
1 parent 4360359 commit 55463fe

7 files changed

Lines changed: 12 additions & 29 deletions

File tree

‎frontend/src/components/floating-menus/ColorPicker.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
colorEquals,
2929
gradientFirstColor,
3030
} from "/src/utility-functions/colors";
31-
import { isPlatformNative } from "/wrapper/pkg/graphite_wasm_wrapper";
3231
import type { FillChoice, MenuDirection, Color } from "/wrapper/pkg/graphite_wasm_wrapper";
3332
3433
type PresetColors = "None" | "Black" | "White" | "Red" | "Yellow" | "Green" | "Cyan" | "Blue" | "Magenta";
@@ -404,7 +403,7 @@
404403
// TODO: Replace this temporary usage of the browser eyedropper API, that only works in Chromium-based browsers, with the custom color sampler system used by the Eyedropper tool
405404
function eyedropperSupported(): boolean {
406405
// TODO: Implement support in the desktop app for OS-level color picking
407-
if (isPlatformNative()) return false;
406+
if (import.meta.env.MODE === "native") return false;
408407
409408
return window.EyeDropper !== undefined;
410409
}

‎frontend/src/components/panels/Welcome.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import type { SubscriptionsRouter } from "/src/subscriptions-router";
99
import { pasteFile } from "/src/utility-functions/files";
1010
import { patchLayout } from "/src/utility-functions/widgets";
11-
import { isPlatformNative } from "/wrapper/pkg/graphite_wasm_wrapper";
1211
import type { EditorWrapper, Layout } from "/wrapper/pkg/graphite_wasm_wrapper";
1312
1413
const subscriptions = getContext<SubscriptionsRouter>("subscriptions");
@@ -50,7 +49,7 @@
5049
</LayoutCol>
5150
<LayoutCol class="bottom-message">
5251
<TextLabel italic={true} disabled={true}>
53-
{#if isPlatformNative()}
52+
{#if import.meta.env.MODE === "native"}
5453
You are testing Release Candidate 4 of the 1.0 desktop release. Please regularly check Discord for the next testing build and report issues you encounter.
5554
{/if}
5655
</TextLabel>

‎frontend/src/components/widgets/inputs/NumberInput.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import FieldInput from "/src/components/widgets/inputs/FieldInput.svelte";
55
import { PRESS_REPEAT_DELAY_MS, PRESS_REPEAT_INTERVAL_MS } from "/src/managers/input";
66
import { browserVersion } from "/src/utility-functions/platform";
7-
import { evaluateMathExpression, isPlatformNative } from "/wrapper/pkg/graphite_wasm_wrapper";
7+
import { evaluateMathExpression } from "/wrapper/pkg/graphite_wasm_wrapper";
88
import type { ActionShortcut, EditorWrapper, NumberInputIncrementBehavior, NumberInputMode } from "/wrapper/pkg/graphite_wasm_wrapper";
99
1010
const BUTTONS_LEFT = 0b0000_0001;
@@ -391,7 +391,7 @@
391391
// Because "mousemove" (and similarly, the "pointermove" event we use) is defined as not being a user-initiated "engagement gesture" event,
392392
// Safari never lets us to enter pointer lock while the mouse button is held down and we are awaiting movement to begin dragging the slider.
393393
const isSafari = browserVersion().toLowerCase().includes("safari");
394-
const usePointerLock = !isSafari && !isPlatformNative();
394+
const usePointerLock = !isSafari && import.meta.env.MODE !== "native";
395395
396396
// On Safari, we use a workaround involving an alternative strategy where we hide the cursor while it's within the web page
397397
// (but we can't hide it when it ventures outside the page), taking advantage of a separate (helpful) Safari bug where it
@@ -404,7 +404,7 @@
404404
405405
// Enter dragging state
406406
if (usePointerLock) target.requestPointerLock();
407-
if (isPlatformNative()) {
407+
if (import.meta.env.MODE === "native") {
408408
editor.appWindowPointerLock();
409409
}
410410
initialValueBeforeDragging = value;

‎frontend/src/components/window/MainWindow.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import type { AppWindowStore } from "/src/stores/app-window";
1111
import type { DialogStore } from "/src/stores/dialog";
1212
import type { TooltipStore } from "/src/stores/tooltip";
13-
import { isPlatformNative } from "/wrapper/pkg/graphite_wasm_wrapper";
1413
1514
const dialog = getContext<DialogStore>("dialog");
1615
const tooltip = getContext<TooltipStore>("tooltip");
@@ -29,7 +28,7 @@
2928
{#if $tooltip.visible}
3029
<Tooltip />
3130
{/if}
32-
{#if isPlatformNative() && new Date() > new Date("2026-04-30")}
31+
{#if import.meta.env.MODE === "native" && new Date() > new Date("2026-04-30")}
3332
<LayoutCol class="release-candidate-expiry">
3433
<TextLabel>
3534
<p>

‎frontend/src/components/window/TitleBar.svelte‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import type { SubscriptionsRouter } from "/src/subscriptions-router";
1111
import { patchLayout } from "/src/utility-functions/widgets";
1212
import type { EditorWrapper, Layout } from "/wrapper/pkg/graphite_wasm_wrapper";
13-
import { isPlatformNative } from "/wrapper/pkg/graphite_wasm_wrapper";
1413
1514
const keyboardLockApiSupported = navigator.keyboard !== undefined && "lock" in navigator.keyboard;
1615
@@ -22,8 +21,8 @@
2221
2322
let menuBarLayout: Layout = [];
2423
25-
$: showFullscreenButton = $appWindow.platform === "Web" || $fullscreen.windowFullscreen || (isPlatformNative() && $appWindow.fullscreen);
26-
$: isFullscreen = isPlatformNative() ? $appWindow.fullscreen : $fullscreen.windowFullscreen;
24+
$: showFullscreenButton = $appWindow.platform === "Web" || $fullscreen.windowFullscreen || (import.meta.env.MODE === "native" && $appWindow.fullscreen);
25+
$: isFullscreen = import.meta.env.MODE === "native" ? $appWindow.fullscreen : $fullscreen.windowFullscreen;
2726
// On Mac, the menu bar height needs to be scaled by the inverse of the UI scale to fit its native window buttons
2827
$: height = $appWindow.platform === "Mac" ? 28 * (1 / $appWindow.uiScale) : 28;
2928
@@ -59,7 +58,7 @@
5958
: undefined}
6059
tooltipShortcut={$tooltip.fullscreenShortcut}
6160
on:click={() => {
62-
if (isPlatformNative()) editor.appWindowFullscreen();
61+
if (import.meta.env.MODE === "native") editor.appWindowFullscreen();
6362
else ($fullscreen.windowFullscreen ? exitFullscreen : enterFullscreen)();
6463
}}
6564
>

‎frontend/src/utility-functions/input.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { pasteFile } from "/src/utility-functions/files";
77
import { makeKeyboardModifiersBitfield, textInputCleanup, getLocalizedScanCode } from "/src/utility-functions/keyboard-entry";
88
import { operatingSystem } from "/src/utility-functions/platform";
99
import type { EditorWrapper } from "/wrapper/pkg/graphite_wasm_wrapper";
10-
import { isPlatformNative } from "/wrapper/pkg/graphite_wasm_wrapper";
1110

1211
const BUTTON_LEFT = 0;
1312
const BUTTON_MIDDLE = 1;
@@ -36,9 +35,9 @@ export async function shouldRedirectKeyboardEventToBackend(e: KeyboardEvent, dia
3635
const accelKey = operatingSystem() === "Mac" ? e.metaKey : e.ctrlKey;
3736

3837
// Cut, copy, and paste is handled in the backend on desktop
39-
if (isPlatformNative() && accelKey && ["KeyX", "KeyC", "KeyV"].includes(key)) return true;
38+
if (import.meta.env.MODE === "native" && accelKey && ["KeyX", "KeyC", "KeyV"].includes(key)) return true;
4039
// But on web, we want to not redirect paste
41-
if (!isPlatformNative() && key === "KeyV" && accelKey) return false;
40+
if (import.meta.env.MODE !== "native" && key === "KeyV" && accelKey) return false;
4241

4342
// Don't redirect user input from text entry into HTML elements
4443
if (targetIsTextField(e.target || undefined) && key !== "Escape" && !(accelKey && ["Enter", "NumpadEnter"].includes(key))) return false;
@@ -57,7 +56,7 @@ export async function shouldRedirectKeyboardEventToBackend(e: KeyboardEvent, dia
5756
if (window.document.querySelector("[data-floating-menu-content]")) return false;
5857

5958
// Web-only keyboard shortcuts
60-
if (!isPlatformNative()) {
59+
if (import.meta.env.MODE !== "native") {
6160
// Don't redirect a fullscreen request, but process it immediately instead
6261
if (((operatingSystem() !== "Mac" && key === "F11") || (operatingSystem() === "Mac" && e.ctrlKey && e.metaKey && key === "KeyF")) && e.type === "keydown" && !e.repeat) {
6362
e.preventDefault();

‎frontend/wrapper/src/editor_wrapper.rs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -909,18 +909,6 @@ impl EditorWrapper {
909909
// Static functions callable from JavaScript without an Editor instance
910910
// ====================================================================
911911

912-
#[wasm_bindgen(js_name = isPlatformNative)]
913-
pub fn is_platform_native() -> bool {
914-
#[cfg(feature = "native")]
915-
{
916-
true
917-
}
918-
#[cfg(not(feature = "native"))]
919-
{
920-
false
921-
}
922-
}
923-
924912
#[wasm_bindgen(js_name = evaluateMathExpression)]
925913
pub fn evaluate_math_expression(expression: &str) -> Option<f64> {
926914
let value = math_parser::evaluate(expression)

0 commit comments

Comments
 (0)