react-native-readium 1.2.1 → 2.0.0-rc.0

package/README.md

@@ -84,10 +84,11 @@ platform :ios, '13.0'
 target 'ExampleApp' do
   config = use_native_modules!
   ...
-  pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3ec154d358f26858071feaa6429e0f1c16bb11bd/GCDWebServer.podspec', modular_headers: true
-  pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.4.0/Support/CocoaPods/ReadiumShared.podspec'
-  pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.4.0/Support/CocoaPods/ReadiumStreamer.podspec'
-  pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.4.0/Support/CocoaPods/ReadiumNavigator.podspec'
+  pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.5/GCDWebServer.podspec', modular_headers: true
+  pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumNavigator.podspec'
+  pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumShared.podspec'
+  pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumStreamer.podspec'
+  pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumInternal.podspec'
   pod 'Minizip', modular_headers: true
   ...
 end
@@ -99,23 +100,6 @@ Finally, install the pods:
 
 #### Android
 
-You might need to [add `jcenter` if you're getting a build failure on android](https://github.com/readium/kotlin-toolkit/issues/31):
-
-```groovy
-// android/build.gradle
-...
-
-allprojects {
-    repositories {
-        ...
-        // required by react-native-readium https://github.com/readium/kotlin-toolkit/issues/31
-        jcenter()
-    }
-    ...
-}
-...
-```
-
 If you're not using `compileSdkVersion` >= 31 you'll need to update that:
 
 ```groovy

package/android/build.gradle

@@ -1,12 +1,11 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
   def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['Readium_kotlinVersion']
-  ext.readium_version = '2.2.1'
+  ext.readium_version = '2.4.1'
 
   repositories {
     google()
     mavenCentral()
-    jcenter()
   }
 
   dependencies {
@@ -49,21 +48,13 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
-  kotlinOptions {
-    jvmTarget = "1.8"
-  }
-
   buildFeatures {
     viewBinding true
   }
 }
 
 repositories {
-
-  maven { url 'https://jitpack.io' }
-
   mavenCentral()
-  jcenter()
   google()
 
   def found = false
@@ -140,51 +131,51 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // readium deps
-  implementation "com.github.readium.kotlin-toolkit:readium-shared:$readium_version"
-  implementation "com.github.readium.kotlin-toolkit:readium-streamer:$readium_version"
-  implementation ("com.github.readium.kotlin-toolkit:readium-navigator:$readium_version") {
+  implementation "org.readium.kotlin-toolkit:readium-shared:$readium_version"
+  implementation "org.readium.kotlin-toolkit:readium-streamer:$readium_version"
+  implementation ("org.readium.kotlin-toolkit:readium-navigator:$readium_version") {
     // this package doesn't provide audio playback, so remove exoplayer
     // transitive deps to avoid potential collisions with other projects.
     exclude group: "com.google.android.exoplayer"
   }
 
   // other deps
-  implementation "androidx.core:core-ktx:1.6.0"
-  implementation "androidx.activity:activity-ktx:1.3.1"
-  implementation "androidx.appcompat:appcompat:1.3.1"
-  implementation "androidx.browser:browser:1.3.0"
+  implementation "androidx.core:core-ktx:1.7.0"
+  implementation "androidx.activity:activity-ktx:1.4.0"
+  implementation "androidx.appcompat:appcompat:1.4.1"
+  implementation "androidx.browser:browser:1.4.0"
   implementation "androidx.cardview:cardview:1.0.0"
-  implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-  implementation "androidx.fragment:fragment-ktx:1.3.6"
-  implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
-  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
-  implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
+  implementation "androidx.constraintlayout:constraintlayout:2.1.3"
+  implementation "androidx.fragment:fragment-ktx:1.4.0"
+  implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
+  implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
   implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
   implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
-  implementation "androidx.paging:paging-runtime-ktx:3.0.1"
+  implementation "androidx.paging:paging-runtime-ktx:3.1.0"
   implementation "androidx.recyclerview:recyclerview:1.2.1"
   implementation "androidx.viewpager2:viewpager2:1.0.0"
   implementation "androidx.webkit:webkit:1.4.0"
-  implementation "com.google.android.material:material:1.4.0"
-  implementation "com.jakewharton.timber:timber:4.7.1"
+  implementation "com.google.android.material:material:1.5.0"
+  implementation "com.jakewharton.timber:timber:5.0.1"
   // AM NOTE: needs to stay this version for now (June 24,2020)
   //noinspection GradleDependency
-  implementation "com.squareup.picasso:picasso:2.5.2"
-  implementation "joda-time:joda-time:2.10.10"
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+  implementation "com.squareup.picasso:picasso:2.71828"
+  implementation "joda-time:joda-time:2.10.13"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
   // AM NOTE: needs to stay this version for now (June 24,2020)
   //noinspection GradleDependency
-  implementation "org.jsoup:jsoup:1.13.1"
+  implementation "org.jsoup:jsoup:1.14.3"
 
   // Room database
-  final room_version = "2.4.0-beta01"
-  implementation "androidx.room:room-runtime:$room_version"
-  implementation "androidx.room:room-ktx:$room_version"
-  annotationProcessor "androidx.room:room-compiler:$room_version"
+  final roomVersion = "2.4.1"
+  implementation "androidx.room:room-runtime:$roomVersion"
+  implementation "androidx.room:room-ktx:$roomVersion"
+  annotationProcessor "androidx.room:room-compiler:$roomVersion"
 
   implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
   //noinspection LifecycleAnnotationProcessorWithJava8
-  annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.3.1"
+  annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.4.0"
 
   testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
   testImplementation "junit:junit:4.13.2"

package/android/src/main/java/com/reactnativereadium/ReadiumView.kt

@@ -78,6 +78,9 @@ class ReadiumView(
             payload
           )
         }
+        else -> {
+          // do nothing
+        }
       }
     }
   }

package/android/src/main/res/layout/fragment_fxllayout_double.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  FIXME: this was imported from `kotlin-toolkit/readium/navigator/src/main/res/layout@v2.2.1`.
+    Not sure why it's not being imported from readium-navigator, but if its not here
+    the android build throws an error due to UserSettings.kt#updateViewCSS
+
+  ~ Module: r2-navigator-kotlin
+  ~ Developers: Aferdita Muriqi
+  ~
+  ~ Copyright (c) 2018. Readium Foundation. All rights reserved.
+  ~ Use of this source code is governed by a BSD-style license which is detailed in the
+  ~ LICENSE file present in the project repository where this source code is maintained.
+  -->
+
+<org.readium.r2.navigator.epub.fxl.R2FXLLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/r2FXLLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal"
+                tools:ignore="UselessParent">
+
+                <org.readium.r2.navigator.R2BasicWebView
+                    android:id="@+id/firstWebView"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_weight="1"
+                    android:layerType="hardware" />
+
+                <org.readium.r2.navigator.R2BasicWebView
+                    android:id="@+id/secondWebView"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:layout_weight="1"
+                    android:layerType="hardware" />
+
+            </LinearLayout>
+        </RelativeLayout>
+    </ScrollView>
+</org.readium.r2.navigator.epub.fxl.R2FXLLayout>

package/android/src/main/res/layout/fragment_fxllayout_single.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  FIXME: this was imported from `kotlin-toolkit/readium/navigator/src/main/res/layout@v2.2.1`.
+    Not sure why it's not being imported from readium-navigator, but if its not here
+    the android build throws an error due to UserSettings.kt#updateViewCSS
+
+
+  ~ Module: r2-navigator-kotlin
+  ~ Developers: Aferdita Muriqi
+  ~
+  ~ Copyright (c) 2018. Readium Foundation. All rights reserved.
+  ~ Use of this source code is governed by a BSD-style license which is detailed in the
+  ~ LICENSE file present in the project repository where this source code is maintained.
+  -->
+
+<org.readium.r2.navigator.epub.fxl.R2FXLLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/r2FXLLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal"
+                tools:ignore="UselessParent">
+
+                <org.readium.r2.navigator.R2BasicWebView
+                    android:id="@+id/webViewSingle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layerType="hardware" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </ScrollView>
+
+</org.readium.r2.navigator.epub.fxl.R2FXLLayout>

package/android/src/main/res/layout/viewpager_fragment_epub.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  FIXME: this was imported from `kotlin-toolkit/readium/navigator/src/main/res/layout@v2.2.1`.
+    Not sure why it's not being imported from readium-navigator, but if its not here
+    the android build throws an error due to UserSettings.kt#updateViewCSS
+
+  ~ Module: r2-navigator-kotlin
+  ~ Developers: Aferdita Muriqi, Clément Baumann
+  ~
+  ~ Copyright (c) 2018. Readium Foundation. All rights reserved.
+  ~ Use of this source code is governed by a BSD-style license which is detailed in the
+  ~ LICENSE file present in the project repository where this source code is maintained.
+  -->
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <org.readium.r2.navigator.R2WebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

package/android/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
     <string name="no_result">No result</string>
+    <string name="epub_navigator_tag">epub_navigator</string>
 </resources>

package/lib/src/components/ReadiumView.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { BaseReadiumViewProps } from '../interfaces';
-export declare type ReadiumProps = BaseReadiumViewProps;
+export type ReadiumProps = BaseReadiumViewProps;
 export declare const ReadiumView: React.FC<ReadiumProps>;

package/lib/src/components/ReadiumView.web.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const ReadiumView: React.ForwardRefExoticComponent<Pick<import("..").BaseReadiumViewProps, "onLocationChange" | "onTableOfContents" | "settings" | "file" | "location" | "style" | "height" | "width"> & React.RefAttributes<{
+export declare const ReadiumView: React.ForwardRefExoticComponent<Omit<import("..").BaseReadiumViewProps, "ref"> & React.RefAttributes<{
     nextPage: () => void;
     prevPage: () => void;
 }>>;

package/lib/src/components/ReadiumView.web.js

@@ -27,15 +27,22 @@ export const ReadiumView = React.forwardRef(({ file, settings, location, onLocat
     if (width)
         mainStyle.width = width;
     return (<View style={styles.container}>
-      {!reader && <div style={styles.loader}>Loading reader...</div>}
+      {!reader && <div style={loaderStyle}>Loading reader...</div>}
       <div id="D2Reader-Container" style={styles.d2Container}>
         <main style={mainStyle} tabIndex={-1} id="iframe-wrapper">
-          <div id="reader-loading" className="loading" style={styles.loader}></div>
+          <div id="reader-loading" className="loading" style={loaderStyle}></div>
           <div id="reader-error" className="error"></div>
         </main>
       </div>
     </View>);
 });
+const loaderStyle = {
+    width: '100%',
+    height: '100%',
+    textAlign: 'center',
+    position: 'relative',
+    top: 'calc(50% - 10px)',
+};
 const styles = StyleSheet.create({
     container: {
         width: '100%',
@@ -51,17 +58,4 @@ const styles = StyleSheet.create({
         height: '100%',
         display: 'flex',
     },
-    button: {
-        width: 50,
-        fontSize: 100,
-        backgroundColor: 'transparent',
-        border: 'none',
-    },
-    loader: {
-        width: '100%',
-        height: '100%',
-        textAlign: 'center',
-        position: 'relative',
-        top: 'calc(50% - 10px)',
-    },
 });

package/lib/src/interfaces/BaseReadiumViewProps.d.ts

@@ -3,7 +3,7 @@ import type { Settings } from './Settings';
 import type { Link } from './Link';
 import type { Locator } from './Locator';
 import type { File } from './File';
-export declare type BaseReadiumViewProps = {
+export type BaseReadiumViewProps = {
     file: File;
     location?: Locator | Link;
     settings?: Partial<Settings>;

package/lib/web/hooks/useLocationObserver.d.ts

@@ -1,2 +1,2 @@
 import type { Link, Locator } from '../../src/interfaces';
-export declare const useLocationObserver: (reader?: import("@d-i-t-a/reader").default | null | undefined, location?: Link | Locator | null | undefined) => void;
+export declare const useLocationObserver: (reader?: D2Reader | null, location?: Link | Locator | null) => void;

package/lib/web/hooks/useSettingsObserver.d.ts

@@ -1,2 +1,2 @@
 import type { Settings } from '../../src/interfaces';
-export declare const useSettingsObserver: (reader?: import("@d-i-t-a/reader").default | null | undefined, settings?: Partial<Settings> | null | undefined) => void;
+export declare const useSettingsObserver: (reader?: D2Reader | null, settings?: Partial<Settings> | null) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-readium",
-  "version": "1.2.1",
+  "version": "2.0.0-rc.0",
   "description": "A react-native wrapper for https://readium.org/",
   "main": "lib/src/index",
   "types": "lib/src/index.d.ts",
@@ -58,25 +58,29 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^11.0.0",
-    "@react-native-community/eslint-config": "^3.2.0",
-    "@release-it/conventional-changelog": "^2.0.0",
-    "@types/jest": "^26.0.0",
-    "@types/react": "^17.0.52",
-    "@types/react-native": "^0.68",
-    "commitlint": "^11.0.0",
+    "@commitlint/config-conventional": "^17.0.2",
+    "@evilmartians/lefthook": "^1.5.0",
+    "@react-native/eslint-config": "^0.73.1",
+    "@release-it/conventional-changelog": "^5.0.0",
+    "@types/jest": "^29.5.5",
+    "@types/react": "^18.2.44",
+    "commitlint": "^17.0.2",
     "conventional-changelog-cli": "^2.2.2",
-    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^7.0.0",
-    "eslint-plugin-prettier": "^3.1.3",
+    "del-cli": "^5.1.0",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "husky": "^6.0.0",
-    "jest": "^26.0.1",
+    "jest": "^29.7.0",
     "pod-install": "^0.1.0",
-    "prettier": "^2.0.5",
-    "react": "^18.2.0",
-    "react-native": "^0.70.6",
-    "release-it": "^14.2.2",
-    "typescript": "^4.1.3"
+    "prettier": "^3.0.3",
+    "react": "18.2.0",
+    "react-native": "0.74.1",
+    "react-native-builder-bob": "^0.23.2",
+    "release-it": "^15.0.0",
+    "rimraf": "^5.0.7",
+    "turbo": "^1.10.7",
+    "typescript": "^5.2.2"
   },
   "peerDependencies": {
     "react": "*",
@@ -114,7 +118,7 @@
   "eslintConfig": {
     "root": true,
     "extends": [
-      "@react-native-community",
+      "@react-native",
       "prettier"
     ],
     "rules": {
@@ -144,5 +148,10 @@
   "dependencies": {
     "@d-i-t-a/reader": "^2.1.4",
     "use-deep-compare": "^1.1.0"
-  }
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "packageManager": "yarn@3.6.4",
+  "stableVersion": "1.2.1"
 }

package/src/components/ReadiumView.web.tsx

@@ -51,14 +51,14 @@ export const ReadiumView = React.forwardRef<{
 
   return (
     <View style={styles.container}>
-      {!reader && <div style={styles.loader}>Loading reader...</div>}
+      {!reader && <div style={loaderStyle}>Loading reader...</div>}
       <div id="D2Reader-Container" style={styles.d2Container}>
         <main
           style={mainStyle}
           tabIndex={-1}
           id="iframe-wrapper"
         >
-          <div id="reader-loading" className="loading" style={styles.loader}></div>
+          <div id="reader-loading" className="loading" style={loaderStyle}></div>
           <div id="reader-error" className="error"></div>
         </main>
       </div>
@@ -66,6 +66,14 @@ export const ReadiumView = React.forwardRef<{
   );
 });
 
+const loaderStyle: React.CSSProperties = {
+  width: '100%',
+  height: '100%',
+  textAlign: 'center',
+  position: 'relative',
+  top: 'calc(50% - 10px)',
+};
+
 const styles = StyleSheet.create({
   container: {
     width: '100%',
@@ -81,17 +89,4 @@ const styles = StyleSheet.create({
     height: '100%',
     display: 'flex',
   },
-  button: {
-    width: 50,
-    fontSize: 100,
-    backgroundColor: 'transparent',
-    border: 'none',
-  },
-  loader: {
-    width: '100%',
-    height: '100%',
-    textAlign: 'center',
-    position: 'relative',
-    top: 'calc(50% - 10px)',
-  },
 });