@innspel/react-native 0.9.1 → 0.9.2

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/InnspelProvider.tsx
-import { createContext as createContext3, useCallback as useCallback3, useContext as useContext4, useMemo as useMemo3, useRef as useRef3, useState as useState4 } from "react";
+import { createContext as createContext3, useCallback as useCallback3, useContext as useContext4, useMemo as useMemo4, useRef as useRef4, useState as useState4 } from "react";
 import { View as View9 } from "react-native";
 
 // src/skjermbilde.ts
@@ -355,7 +355,7 @@ import {
   InnspelApiError,
   InnspelQueueFullError
 } from "@innspel/core";
-import { useCallback as useCallback2, useContext as useContext3, useEffect, useRef as useRef2, useState as useState3 } from "react";
+import { useCallback as useCallback2, useContext as useContext3, useEffect, useRef as useRef3, useState as useState3 } from "react";
 import { KeyboardAvoidingView, Modal, Pressable as Pressable5, View as View8 } from "react-native";
 import { initialWindowMetrics, SafeAreaInsetsContext } from "react-native-safe-area-context";
 
@@ -517,11 +517,11 @@ function Ikon({
 }
 
 // src/widget/Felt.tsx
-import { useMemo, useState } from "react";
+import { useMemo as useMemo2, useState } from "react";
 import { Pressable as Pressable2, ScrollView, Text as Text2, TextInput, View as View2 } from "react-native";
 
 // src/widget/primitiver.tsx
-import "react";
+import { useMemo, useRef } from "react";
 import { Pressable, Text, View } from "react-native";
 import { jsx as jsx2, jsxs } from "react/jsx-runtime";
 function Btn({
@@ -534,10 +534,12 @@ function Btn({
   accessibilityLabel,
   grow,
   testID,
-  busy
+  busy,
+  trykkForbiForelder
 }) {
   const tema = useTema();
   const c = tema.color;
+  const forbi = useTrykkForbiForelder(onPress, !!disabled, tema.touch / 2);
   const bakgrunn = variant === "primary" ? c.actionPrimary : variant === "secondary" ? c.surfaceRaised : "transparent";
   const tekstfarge = variant === "primary" ? c.onActionPrimary : variant === "danger" ? c.danger : c.actionSecondaryText;
   const kant = variant === "ghost" ? "transparent" : variant === "primary" ? c.actionPrimary : c.actionSecondaryBorder;
@@ -551,6 +553,7 @@ function Btn({
         accessibilityState: { disabled: !!disabled, busy: !!busy },
         disabled,
         onPress,
+        ...trykkForbiForelder ? forbi : {},
         style: {
           minHeight: tema.touch,
           borderRadius: tema.radius.md,
@@ -583,6 +586,37 @@ function Btn({
     hint ? /* @__PURE__ */ jsx2(Hint, { children: hint }) : null
   ] });
 }
+function useTrykkForbiForelder(onPress, laast, slingring) {
+  const start = useRef(null);
+  const fikkResponder = useRef(false);
+  const siste = useRef({ onPress, laast });
+  siste.current = { onPress, laast };
+  return useMemo(
+    () => ({
+      onPressIn: () => {
+        fikkResponder.current = true;
+      },
+      onTouchStart: (e) => {
+        start.current = { x: e.nativeEvent.pageX, y: e.nativeEvent.pageY };
+      },
+      onTouchEnd: (e) => {
+        const s = start.current;
+        start.current = null;
+        const innenfor = s !== null && Math.abs(e.nativeEvent.pageX - s.x) <= slingring && Math.abs(e.nativeEvent.pageY - s.y) <= slingring;
+        setTimeout(() => {
+          const tatt = fikkResponder.current;
+          fikkResponder.current = false;
+          if (!tatt && innenfor && !siste.current.laast) siste.current.onPress?.();
+        }, 0);
+      },
+      onTouchCancel: () => {
+        start.current = null;
+        fikkResponder.current = false;
+      }
+    }),
+    [slingring]
+  );
+}
 function H({ children, sub }) {
   const tema = useTema();
   return /* @__PURE__ */ jsxs(View, { style: { gap: tema.space.xs }, children: [
@@ -940,7 +974,7 @@ function Felt({
   const full = brukt >= textMaxLength;
   const visTeller = brukt >= textMaxLength * 0.8;
   const uavklart = funn.find((f) => !beholdt.includes(f.match));
-  const linjer = useMemo(() => {
+  const linjer = useMemo2(() => {
     const etiketter = {
       screen: "Skjerm",
       appVersion: "Appversjon",
@@ -1217,7 +1251,8 @@ function Felt({
         disabled: forKort || sender,
         busy: sender,
         hint: forKort ? tekst.forKort(minTextLength) : harVedlegg ? tekst.sendHintMedBilde : void 0,
-        onPress: onSend
+        onPress: onSend,
+        trykkForbiForelder: true
       }
     ) })
   ] });
@@ -1550,7 +1585,7 @@ function MineInnspill({
 
 // src/widget/Skjermbilde.tsx
 import { skaler, strokTilRekter, treffer, trykkTilRekt } from "@innspel/core";
-import { useCallback, useMemo as useMemo2, useRef, useState as useState2 } from "react";
+import { useCallback, useMemo as useMemo3, useRef as useRef2, useState as useState2 } from "react";
 import { Image as Image2, Pressable as Pressable4, StyleSheet, Text as Text7, View as View7 } from "react-native";
 import { jsx as jsx8, jsxs as jsxs7 } from "react/jsx-runtime";
 function Skjermbilde({
@@ -1569,13 +1604,13 @@ function Skjermbilde({
   const [allTekst, setAllTekst] = useState2(false);
   const [egne, setEgne] = useState2([]);
   const [ramme, setRamme] = useState2(null);
-  const strok = useRef([]);
-  const visning = useMemo2(() => {
+  const strok = useRef2([]);
+  const visning = useMemo3(() => {
     if (!ramme) return null;
     const s = Math.min(ramme.width / bilde.width, ramme.height / bilde.height);
     return { width: Math.floor(bilde.width * s), height: Math.floor(bilde.height * s) };
   }, [ramme, bilde.width, bilde.height]);
-  const automasker = useMemo2(
+  const automasker = useMemo3(
     () => visning ? automaskerRot.map((r) => skaler(r, rotStorrelse, visning)) : [],
     [automaskerRot, rotStorrelse, visning]
   );
@@ -1792,7 +1827,7 @@ function Widget({
   const tema = useTema();
   const insets = useContext3(SafeAreaInsetsContext) ?? initialWindowMetrics?.insets ?? { top: 0, bottom: 0, left: 0, right: 0 };
   const skjermbilde = useSkjermbilde();
-  const previewRef = useRef2(null);
+  const previewRef = useRef3(null);
   const [steg, setSteg] = useState3("valg");
   const [spor, setSpor] = useState3("feil");
   const [verdi, setVerdi] = useState3("");
@@ -1833,9 +1868,23 @@ function Widget({
     setVedlegg(void 0);
     setKomponerer(false);
   }, []);
+  const [mineDirekte, setMineDirekte] = useState3(false);
+  const [stegForMine, setStegForMine] = useState3("valg");
+  const stegRef = useRef3(steg);
+  stegRef.current = steg;
+  const harUtkast = verdi.trim().length > 0 || vedlegg !== void 0;
   const lukk = useCallback2(() => {
+    onLukk();
+    if (stegRef.current === "mine" && mineDirekte) {
+      setSteg(stegForMine);
+      setMineDirekte(false);
+    }
+  }, [onLukk, mineDirekte, stegForMine]);
+  const lukkOgNullstill = useCallback2(() => {
     onLukk();
     nullstill();
+    setMineDirekte(false);
+    setStegForMine("valg");
   }, [onLukk, nullstill]);
   useEffect(() => {
     if (!synlig) return;
@@ -1845,8 +1894,8 @@ function Widget({
     if (!client.isAnonymous) {
       void client.subjects.submissions().then(setMine).catch(() => void 0);
     }
-    if (apneOpsjoner?.view === "mine" && !client.isAnonymous) void visMine();
-    else if (apneOpsjoner?.track) velgSpor(apneOpsjoner.track);
+    if (apneOpsjoner?.view === "mine" && !client.isAnonymous) void visMine(true);
+    else if (apneOpsjoner?.track && !harUtkast) void velgSpor(apneOpsjoner.track);
   }, [synlig]);
   const hentKort = useCallback2(async () => {
     setLasterKort(true);
@@ -1944,6 +1993,11 @@ function Widget({
   }, []);
   const gaaTilbake = useCallback2(() => {
     setFeil(void 0);
+    if (steg === "mine") {
+      if (mineDirekte) lukk();
+      else setSteg("valg");
+      return;
+    }
     if (steg === "skjermbilde") {
       setBilde(void 0);
       setAutomasker([]);
@@ -1955,7 +2009,12 @@ function Widget({
       return;
     }
     setSteg("valg");
-  }, [steg, spor, kort.length]);
+  }, [steg, spor, kort.length, mineDirekte, lukk]);
+  const androidTilbake = useCallback2(() => {
+    if (steg === "valg") lukk();
+    else if (steg === "kvittering") lukkOgNullstill();
+    else gaaTilbake();
+  }, [steg, lukk, lukkOgNullstill, gaaTilbake]);
   const send = useCallback2(async () => {
     setSender(true);
     setFeil(void 0);
@@ -2002,7 +2061,13 @@ function Widget({
     },
     [client]
   );
-  const visMine = useCallback2(async () => {
+  const visMine = useCallback2(async (direkte = false) => {
+    if (direkte) {
+      if (stegRef.current !== "mine") setStegForMine(stegRef.current);
+    } else {
+      setStegForMine("valg");
+    }
+    setMineDirekte(direkte);
     setSteg("mine");
     setLasterMine(true);
     try {
@@ -2013,13 +2078,18 @@ function Widget({
       setLasterMine(false);
     }
   }, [client]);
+  const nyttFraMine = useCallback2(() => {
+    setMineDirekte(false);
+    if (harUtkast) setSteg(stegForMine);
+    else nullstill();
+  }, [harUtkast, stegForMine, nullstill]);
   return /* @__PURE__ */ jsx9(
     Modal,
     {
       visible: synlig,
       transparent: true,
       animationType: "slide",
-      onRequestClose: lukk,
+      onRequestClose: androidTilbake,
       accessibilityViewIsModal: true,
       children: /* @__PURE__ */ jsx9(
         KeyboardAvoidingView,
@@ -2057,7 +2127,7 @@ function Widget({
                       testID: "lukk",
                       accessibilityRole: "button",
                       accessibilityLabel: tekst.lukk,
-                      onPress: lukk,
+                      onPress: steg === "kvittering" ? lukkOgNullstill : lukk,
                       style: { minWidth: tema.touch, minHeight: tema.touch, alignItems: "center", justifyContent: "center" },
                       children: /* @__PURE__ */ jsx9(Ikon, { navn: "close-outline", farge: tema.color.textSecondary })
                     }
@@ -2075,7 +2145,7 @@ function Widget({
                       ikon: "list-outline",
                       label: mine.length > 0 ? tekst.mineMedAntall(mine.length) : tekst.mineTittel,
                       accessibilityLabel: mine.length > 0 ? tekst.mineEtikett(mine.length) : tekst.mineTittel,
-                      onPress: visMine
+                      onPress: () => void visMine()
                     }
                   ) : null
                 ] }) : null,
@@ -2139,7 +2209,7 @@ function Widget({
                     ...kvittering.nr ? { saksnummer: kvittering.nr } : {},
                     ...kvittering.vedlegg ? { vedlegg: kvittering.vedlegg } : {},
                     ...kvittering.frist ? { frist: kvittering.frist } : {},
-                    onLukk: lukk
+                    onLukk: lukkOgNullstill
                   }
                 ) : null,
                 steg === "mine" ? /* @__PURE__ */ jsx9(
@@ -2148,7 +2218,7 @@ function Widget({
                     rader: mine,
                     laster: lasterMine,
                     ...tenantName ? { tenantName } : {},
-                    onNytt: nullstill
+                    onNytt: nyttFraMine
                   }
                 ) : null
               ]
@@ -2191,9 +2261,9 @@ function InnspelProvider({
 }) {
   const [synlig, setSynlig] = useState4(false);
   const [apneOpsjoner, setApneOpsjoner] = useState4();
-  const registrert = useRef3(false);
-  const rootRef = useRef3(null);
-  const privat = useMemo3(createPrivateRegistry, []);
+  const registrert = useRef4(false);
+  const rootRef = useRef4(null);
+  const privat = useMemo4(createPrivateRegistry, []);
   const open = useCallback3(
     async (options) => {
       setApneOpsjoner(options);
@@ -2206,9 +2276,9 @@ function InnspelProvider({
     client.registerPresenter({ open });
     registrert.current = true;
   }
-  const tema = useMemo3(() => byggTema(theme, colorScheme), [theme, colorScheme]);
-  const verdi = useMemo3(() => ({ client, open, close }), [client, open, close]);
-  const skjermbilde = useMemo3(
+  const tema = useMemo4(() => byggTema(theme, colorScheme), [theme, colorScheme]);
+  const verdi = useMemo4(() => ({ client, open, close }), [client, open, close]);
+  const skjermbilde = useMemo4(
     () => ({ adapter: screenshot ?? null, rootRef, privat }),
     [screenshot, privat]
   );
@@ -2238,11 +2308,11 @@ function useInnspel() {
 }
 
 // src/InnspelPrivate.tsx
-import { useEffect as useEffect2, useRef as useRef4 } from "react";
+import { useEffect as useEffect2, useRef as useRef5 } from "react";
 import { View as View10 } from "react-native";
 import { jsx as jsx11 } from "react/jsx-runtime";
 function InnspelPrivate({ children, style }) {
-  const ref = useRef4(null);
+  const ref = useRef5(null);
   const kontekst = useSkjermbilde();
   const registrer = kontekst?.privat.register;
   useEffect2(() => {