@adriansteffan/reactive 0.0.21 → 0.0.23

package/src/components/upload.tsx

@@ -2,11 +2,10 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useMutation } from '@tanstack/react-query';
 import { v4 as uuidv4 } from 'uuid';
 import { post } from '../utils/request';
-import { FileUpload, getParam, StudyEvent } from '../utils/common';
+import { BaseComponentProps, FileUpload, getParam, getPlatform, Platform, Store, TrialData } from '../utils/common';
 import { BlobWriter, TextReader, ZipWriter } from '@zip.js/zip.js';
 
 import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
-import { Capacitor } from '@capacitor/core';
 
 interface UploadPayload {
   sessionId: string;
@@ -120,25 +119,13 @@ const createCapacitorFileBackend = (parentFolder?: string): FileBackend => {
   };
 };
 
-export type Platform = 'electron' | 'capacitor' | 'web';
-
-export const getPlatform = (): Platform => {
-  if ((window as any).electronAPI) {
-    return 'electron';
-  } else if (Capacitor.isNativePlatform()) {
-    return 'capacitor';
-  } else {
-    return 'web';
-  }
-};
-
 const getFileBackend = (parentDir?: string): { backend: FileBackend | null, type: Platform } => {
   const platform = getPlatform();
   
   switch (platform) {
-    case 'electron':
+    case 'desktop':
       return { backend: createElectronFileBackend(), type: platform };
-    case 'capacitor':
+    case 'mobile':
       return { backend: createCapacitorFileBackend(parentDir), type: platform };
     case 'web':
       return { backend: null, type: platform };
@@ -168,16 +155,15 @@ const getUniqueDirectoryName = async (
 export default function Upload({
   data,
   next,
+  store,
   sessionID,
   generateFiles,
   uploadRaw = true,
   autoUpload = false,
   androidFolderName,
-}: {
-  data: StudyEvent[];
-  next: () => void;
+}: BaseComponentProps & {
   sessionID?: string | null;
-  generateFiles: (sessionID: string, data: StudyEvent[]) => FileUpload[];
+  generateFiles: (sessionID: string, data: TrialData[], store?: Store) => FileUpload[];
   uploadRaw: boolean;
   autoUpload: boolean;
   androidFolderName?: string;
@@ -199,7 +185,7 @@ export default function Upload({
     onSuccess: (res: UploadResponse) => {
       if (res.status === 200) {
         setUploadState('success');
-        next();
+        next({});
       } else {
         setUploadState('error');
       }
@@ -239,7 +225,7 @@ export default function Upload({
   
     const sessionIDUpload = sessionID ?? uuidv4();
   
-    const files: FileUpload[] = generateFiles ? generateFiles(sessionIDUpload, data) : [];
+    const files: FileUpload[] = generateFiles ? generateFiles(sessionIDUpload, data, store) : [];
     if (uploadRaw) {
       files.push({
         filename: `${sessionIDUpload}.raw.json`,
@@ -259,7 +245,7 @@ export default function Upload({
       }
   
       if (!shouldUpload) {
-        next();
+        next({});
         return;
       }
   
@@ -283,7 +269,7 @@ export default function Upload({
           }
           
           setUploadState('success');
-          next();
+          next({});
         } catch (error) {
           console.error(`Error saving files with ${type}:`, error);
           setUploadState('error');

package/src/mod.tsx

@@ -1,5 +1,6 @@
 import './index.css';
 import Text from './components/text';
+import PlainInput from './components/plaininput';
 import ProlificEnding from './components/prolificending';
 import MicCheck from './components/microphonecheck';
 import Quest from './components/quest';
@@ -10,7 +11,7 @@ import ExperimentProvider from './components/experimentprovider';
 import Experiment from './components/experiment';
 import { BaseComponentProps, ExperimentConfig } from './utils/common';
 
-export { Text, ProlificEnding, MicCheck, Quest, Upload, EnterFullscreen, ExitFullscreen, Experiment, ExperimentProvider};
+export { Text, ProlificEnding, MicCheck, Quest, Upload, EnterFullscreen, ExitFullscreen, Experiment, ExperimentProvider, PlainInput};
 export type { BaseComponentProps, ExperimentConfig };
 export * from './utils/common';
 

package/src/utils/common.ts

@@ -1,3 +1,5 @@
+import { Capacitor } from "@capacitor/core";
+
 export function now() {
   return Math.round(performance.now());
 }
@@ -11,13 +13,14 @@ export function shuffle(array: any[]) {
   return array;
 }
 
-export function isDesktop(){
-  return (window as any).electronAPI !== undefined
+export function isDesktop() {
+  return (window as any).electronAPI !== undefined;
 }
 
 // Generic type for all data structures
-export interface StudyEvent {
+export interface TrialData {
   index: number;
+  trialNumber: number,
   type: string;
   name: string;
   data: any;
@@ -36,10 +39,13 @@ export interface ExperimentConfig {
   showProgressBar: boolean;
 }
 
+export interface Store { [key: string]: any }
+
 export interface BaseComponentProps {
   next: (data: object) => void;
-  data?: object;
-  metaData?: object;
+  data: TrialData[];
+  store?: Store;
+  updateStore: (mergeIn: Store) => void;
 }
 
 type ParamType = 'string' | 'number' | 'boolean' | 'array' | 'json';
@@ -115,3 +121,17 @@ export function getParam<T extends ParamType>(
   if (value === undefined || value === null) return defaultValue;
   return convertValue(value);
 }
+
+
+
+export type Platform = 'desktop' | 'mobile' | 'web';
+
+export const getPlatform = (): Platform => {
+  if ((window as any).electronAPI) {
+    return 'desktop';
+  } else if (Capacitor.isNativePlatform()) {
+    return 'mobile';
+  } else {
+    return 'web';
+  }
+};

package/template/README.md

@@ -178,6 +178,8 @@ For ease of use, it makes sense to run the web version for most of the developme
 
 To build an iOS app containing your experiment, you will need a machine running MacOS and an installation of [XCode](https://apps.apple.com/us/app/xcode/id497799835). Furthermore, you will need to install [CocoaPods](https://cocoapods.org/), which is most easily installed with [Homebrew](https://brew.sh/).
 
+Temporary uglyness: Due to a bug in the dependency in for the capacitor fullscreening plugin, we need to manually add a file if we want to build for iOS, described (in the related Github issue)[https://github.com/hugotomazi/navigation-bar/issues/31#issuecomment-2687412929]. Here's to hope that that will be fixed in the near future.
+
 To set up the iOS project, run 
 
 ```