Update prettier config for the project. (#16303)
* Update prettier config for the project. * Add prettier to make lint-fix.
This commit is contained in:
Rahul Pratap
GitHub
parent
428616332b
commit
c80992b6bf
64
.detoxrc.js
64
.detoxrc.js
|
|
@ -1,37 +1,37 @@
|
|||
module.exports = {
|
||||
"testRunner": "jest",
|
||||
"testRegex": "\\.visual\\.js$",
|
||||
"runner-config": "visual-test/config.json",
|
||||
"devices": {
|
||||
"simulator": {
|
||||
"type": "ios.simulator",
|
||||
"device": {
|
||||
"type": "iPhone 11 Pro"
|
||||
}
|
||||
}
|
||||
testRunner: 'jest',
|
||||
testRegex: '\\.visual\\.js$',
|
||||
'runner-config': 'visual-test/config.json',
|
||||
devices: {
|
||||
simulator: {
|
||||
type: 'ios.simulator',
|
||||
device: {
|
||||
type: 'iPhone 11 Pro',
|
||||
},
|
||||
"apps": {
|
||||
"ios.release": {
|
||||
"name": "StatusIm",
|
||||
"type": "ios.app",
|
||||
"binaryPath": "ios/build/Build/Products/Release-iphonesimulator/StatusIm.app",
|
||||
"build": "make release-ios"
|
||||
},
|
||||
"ios.debug": {
|
||||
"name": "StatusIm",
|
||||
"type": "ios.app",
|
||||
"binaryPath": process.env.TEST_BINARY_PATH,
|
||||
"build": "make run-ios SIMULATOR='iPhone 11 Pro'"
|
||||
}
|
||||
},
|
||||
"configurations": {
|
||||
"ios.sim.release": {
|
||||
"device": "simulator",
|
||||
"app": "ios.release"
|
||||
apps: {
|
||||
'ios.release': {
|
||||
name: 'StatusIm',
|
||||
type: 'ios.app',
|
||||
binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/StatusIm.app',
|
||||
build: 'make release-ios',
|
||||
},
|
||||
"ios.sim.debug": {
|
||||
"device": "simulator",
|
||||
"app": "ios.debug"
|
||||
}
|
||||
}
|
||||
}
|
||||
'ios.debug': {
|
||||
name: 'StatusIm',
|
||||
type: 'ios.app',
|
||||
binaryPath: process.env.TEST_BINARY_PATH,
|
||||
build: "make run-ios SIMULATOR='iPhone 11 Pro'",
|
||||
},
|
||||
},
|
||||
configurations: {
|
||||
'ios.sim.release': {
|
||||
device: 'simulator',
|
||||
app: 'ios.release',
|
||||
},
|
||||
'ios.sim.debug': {
|
||||
device: 'simulator',
|
||||
app: 'ios.debug',
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
module.exports = {
|
||||
root: true,
|
||||
extends: '@react-native-community',
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
*
|
||||
!*.js
|
||||
!*/
|
||||
*.clj-kondo
|
||||
*.shadow-cljs
|
||||
modules
|
||||
result
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
module.exports = {
|
||||
bracketSpacing: false,
|
||||
bracketSameLine: true,
|
||||
arrowParens: 'always',
|
||||
printWidth: 120,
|
||||
semi: true,
|
||||
singleQuote: true,
|
||||
tabWidth: 2,
|
||||
trailingComma: 'all',
|
||||
tabWidth: 4,
|
||||
useTabs: false,
|
||||
};
|
||||
|
|
|
|||
6
Makefile
6
Makefile
|
|
@ -306,14 +306,16 @@ lint: ##@test Run code style checks
|
|||
@sh scripts/lint-re-frame-in-quo-components.sh && \
|
||||
clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
|
||||
ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
|
||||
zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES
|
||||
zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
|
||||
yarn prettier
|
||||
|
||||
# NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
|
||||
lint-fix: export TARGET := default
|
||||
lint-fix: ##@test Run code style checks and fix issues
|
||||
ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
|
||||
zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
|
||||
zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES
|
||||
zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
|
||||
yarn prettier
|
||||
|
||||
|
||||
shadow-server: export TARGET := clojure
|
||||
|
|
|
|||
|
|
@ -1,14 +1,9 @@
|
|||
module.exports = {
|
||||
|
||||
"presets": [
|
||||
"module:metro-react-native-babel-preset"
|
||||
],
|
||||
"plugins": [
|
||||
"react-native-reanimated/plugin"
|
||||
],
|
||||
"env": {
|
||||
"test": {
|
||||
"presets": [
|
||||
presets: ['module:metro-react-native-babel-preset'],
|
||||
plugins: ['react-native-reanimated/plugin'],
|
||||
env: {
|
||||
test: {
|
||||
presets: [
|
||||
'@babel/preset-react',
|
||||
[
|
||||
'@babel/preset-env',
|
||||
|
|
@ -19,6 +14,6 @@ module.exports = {
|
|||
},
|
||||
],
|
||||
],
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
|
|||
4
index.js
4
index.js
|
|
@ -1,2 +1,2 @@
|
|||
import "node-libs-react-native/globals";
|
||||
import "./result/index.js";
|
||||
import 'node-libs-react-native/globals';
|
||||
import './result/index.js';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
var binary = require('@mapbox/node-pre-gyp');
|
||||
var path = require('path');
|
||||
var binding_path = binary.find(path.resolve(path.join(__dirname,'./../../../package.json')));
|
||||
var binding_path = binary.find(path.resolve(path.join(__dirname, './../../../package.json')));
|
||||
|
||||
module.exports = require(binding_path);
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
"app:compile:android": "shadow-cljs compile android",
|
||||
"app:watch": "shadow-cljs watch android",
|
||||
"app:packager": "react-native start --host 0.0.0.0 --port 8081",
|
||||
"app:android": "react-native run-android"
|
||||
"app:android": "react-native run-android",
|
||||
"prettier": "prettier --write ."
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/preset-typescript": "^7.17.12",
|
||||
|
|
@ -95,6 +96,7 @@
|
|||
"jest-image-snapshot": "^5.1.0",
|
||||
"nodemon": "^2.0.16",
|
||||
"nyc": "^14.1.1",
|
||||
"prettier": "^2.8.8",
|
||||
"process": "0.11.10",
|
||||
"react-test-renderer": "18.0.0",
|
||||
"rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
(function () {
|
||||
if (typeof EthereumProvider === "undefined") {
|
||||
if (typeof EthereumProvider === 'undefined') {
|
||||
var callbackId = 0;
|
||||
var callbacks = {};
|
||||
|
||||
var bridgeSend = function (data) {
|
||||
ReactNativeWebView.postMessage(JSON.stringify(data));
|
||||
}
|
||||
};
|
||||
|
||||
var history = window.history;
|
||||
var pushState = history.pushState;
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
setTimeout(function () {
|
||||
bridgeSend({
|
||||
type: 'history-state-changed',
|
||||
navState: {url: location.href, title: document.title}
|
||||
navState: { url: location.href, title: document.title },
|
||||
});
|
||||
}, 100);
|
||||
return pushState.apply(history, arguments);
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
type: 'api-request',
|
||||
permission: permission,
|
||||
messageId: messageId,
|
||||
params: params
|
||||
params: params,
|
||||
});
|
||||
|
||||
return new Promise(function (resolve, reject) {
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
var regex = new RegExp(callback.regex);
|
||||
if (!result) {
|
||||
if (callback.reject) {
|
||||
callback.reject(new Error("Cancelled"));
|
||||
callback.reject(new Error('Cancelled'));
|
||||
}
|
||||
} else if (regex.test(result)) {
|
||||
if (callback.resolve) {
|
||||
|
|
@ -56,19 +56,19 @@
|
|||
}
|
||||
|
||||
function Unauthorized() {
|
||||
this.name = "Unauthorized";
|
||||
this.name = 'Unauthorized';
|
||||
this.id = 4100;
|
||||
this.code = 4100;
|
||||
this.message = "The requested method and/or account has not been authorized by the user.";
|
||||
this.message = 'The requested method and/or account has not been authorized by the user.';
|
||||
}
|
||||
|
||||
Unauthorized.prototype = Object.create(Error.prototype);
|
||||
|
||||
function UserRejectedRequest() {
|
||||
this.name = "UserRejectedRequest";
|
||||
this.name = 'UserRejectedRequest';
|
||||
this.id = 4001;
|
||||
this.code = 4001;
|
||||
this.message = "The user rejected the request.";
|
||||
this.message = 'The user rejected the request.';
|
||||
}
|
||||
|
||||
UserRejectedRequest.prototype = Object.create(Error.prototype);
|
||||
|
|
@ -78,38 +78,35 @@
|
|||
var callback = callbacks[id];
|
||||
|
||||
if (callback) {
|
||||
if (data.type === "api-response") {
|
||||
if (data.type === 'api-response') {
|
||||
if (data.permission == 'qr-code') {
|
||||
qrCodeResponse(data, callback);
|
||||
} else if (data.isAllowed) {
|
||||
if (data.permission == 'web3') {
|
||||
var selectedAddress = data.data[0]
|
||||
var selectedAddress = data.data[0];
|
||||
window.statusAppcurrentAccountAddress = selectedAddress;
|
||||
// Set deprecated metamask fields
|
||||
window.ethereum.selectedAddress = selectedAddress;
|
||||
window.ethereum.emit("accountsChanged", data.data);
|
||||
window.ethereum.emit('accountsChanged', data.data);
|
||||
}
|
||||
callback.resolve(data.data);
|
||||
} else {
|
||||
callback.reject(new UserRejectedRequest());
|
||||
}
|
||||
} else if (data.type === "web3-send-async-callback") {
|
||||
} else if (data.type === 'web3-send-async-callback') {
|
||||
if (callback.beta) {
|
||||
if (data.error) {
|
||||
if (data.error.code == 4100)
|
||||
callback.reject(new Unauthorized());
|
||||
else
|
||||
callback.reject(data.error);
|
||||
if (data.error.code == 4100) callback.reject(new Unauthorized());
|
||||
else callback.reject(data.error);
|
||||
} else {
|
||||
if (window.statusAppDebug) {
|
||||
console.log("resolve " + callback.method + " :" + JSON.stringify(data.result.result));
|
||||
console.log('resolve ' + callback.method + ' :' + JSON.stringify(data.result.result));
|
||||
}
|
||||
callback.resolve(data.result.result);
|
||||
}
|
||||
} else if (callback.results) {
|
||||
callback.results.push(data.error || data.result);
|
||||
if (callback.results.length == callback.num)
|
||||
callback.callback(undefined, callback.results);
|
||||
if (callback.results.length == callback.num) callback.callback(undefined, callback.results);
|
||||
} else {
|
||||
callback.callback(data.error, data.result);
|
||||
}
|
||||
|
|
@ -120,46 +117,44 @@
|
|||
function web3SuccessResponse(payload, result) {
|
||||
return {
|
||||
id: payload.id,
|
||||
jsonrpc: "2.0",
|
||||
jsonrpc: '2.0',
|
||||
method: payload.method,
|
||||
result: result
|
||||
result: result,
|
||||
};
|
||||
}
|
||||
|
||||
function web3ErrorResponse(payload, error) {
|
||||
return {
|
||||
id: payload.id,
|
||||
jsonrpc: "2.0",
|
||||
jsonrpc: '2.0',
|
||||
method: payload.method,
|
||||
error: error
|
||||
error: error,
|
||||
};
|
||||
}
|
||||
|
||||
function getSyncResponse(payload) {
|
||||
if (payload.method == "eth_accounts" && (typeof window.statusAppcurrentAccountAddress !== "undefined")) {
|
||||
return web3SuccessResponse(payload, [window.statusAppcurrentAccountAddress])
|
||||
} else if (payload.method == "eth_coinbase" && (typeof window.statusAppcurrentAccountAddress !== "undefined")) {
|
||||
return web3SuccessResponse(payload, window.statusAppcurrentAccountAddress)
|
||||
} else if (payload.method == "net_version") {
|
||||
return web3SuccessResponse(payload, window.statusAppNetworkId)
|
||||
} else if (payload.method == "eth_chainId") {
|
||||
return web3SuccessResponse(payload, "0x" + Number(window.statusAppNetworkId).toString(16))
|
||||
} else if (payload.method == "eth_uninstallFilter") {
|
||||
if (payload.method == 'eth_accounts' && typeof window.statusAppcurrentAccountAddress !== 'undefined') {
|
||||
return web3SuccessResponse(payload, [window.statusAppcurrentAccountAddress]);
|
||||
} else if (payload.method == 'eth_coinbase' && typeof window.statusAppcurrentAccountAddress !== 'undefined') {
|
||||
return web3SuccessResponse(payload, window.statusAppcurrentAccountAddress);
|
||||
} else if (payload.method == 'net_version') {
|
||||
return web3SuccessResponse(payload, window.statusAppNetworkId);
|
||||
} else if (payload.method == 'eth_chainId') {
|
||||
return web3SuccessResponse(payload, '0x' + Number(window.statusAppNetworkId).toString(16));
|
||||
} else if (payload.method == 'eth_uninstallFilter') {
|
||||
return web3SuccessResponse(payload, true);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
var StatusAPI = function () {
|
||||
};
|
||||
var StatusAPI = function () {};
|
||||
|
||||
StatusAPI.prototype.getContactCode = function () {
|
||||
return sendAPIrequest('contact-code');
|
||||
};
|
||||
|
||||
var EthereumProvider = function () {
|
||||
};
|
||||
var EthereumProvider = function () {};
|
||||
|
||||
EthereumProvider.prototype.isStatus = true;
|
||||
EthereumProvider.prototype.status = new StatusAPI();
|
||||
|
|
@ -168,7 +163,7 @@
|
|||
};
|
||||
// Set legacy metamask fields https://docs.metamask.io/guide/ethereum-provider.html#legacy-api
|
||||
EthereumProvider.prototype.networkVersion = window.statusAppNetworkId;
|
||||
EthereumProvider.prototype.chainId = "0x" + Number(window.statusAppNetworkId).toString(16);
|
||||
EthereumProvider.prototype.chainId = '0x' + Number(window.statusAppNetworkId).toString(16);
|
||||
|
||||
EthereumProvider.prototype._events = {};
|
||||
|
||||
|
|
@ -177,51 +172,51 @@
|
|||
this._events[name] = [];
|
||||
}
|
||||
this._events[name].push(listener);
|
||||
}
|
||||
};
|
||||
|
||||
EthereumProvider.prototype.removeListener = function (name, listenerToRemove) {
|
||||
if (!this._events[name]) {
|
||||
return
|
||||
return;
|
||||
}
|
||||
|
||||
const filterListeners = (listener) => listener !== listenerToRemove;
|
||||
this._events[name] = this._events[name].filter(filterListeners);
|
||||
}
|
||||
};
|
||||
|
||||
EthereumProvider.prototype.removeAllListeners = function () {
|
||||
this._events = {};
|
||||
}
|
||||
};
|
||||
|
||||
EthereumProvider.prototype.emit = function (name, data) {
|
||||
if (!this._events[name]) {
|
||||
return
|
||||
return;
|
||||
}
|
||||
this._events[name].forEach(cb => {
|
||||
this._events[name].forEach((cb) => {
|
||||
// Fixes: https://github.com/status-im/status-mobile/issues/13642
|
||||
// Metamask also errors on the same issue, but it's using https://github.com/MetaMask/safe-event-emitter and therefore the dapp still works
|
||||
try {
|
||||
cb(data)
|
||||
cb(data);
|
||||
} catch (e) {
|
||||
setTimeout((() => {
|
||||
throw e
|
||||
}))
|
||||
}
|
||||
setTimeout(() => {
|
||||
throw e;
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
EthereumProvider.prototype.enable = function () {
|
||||
if (window.statusAppDebug) {
|
||||
console.log("enable");
|
||||
console.log('enable');
|
||||
}
|
||||
return sendAPIrequest('web3');
|
||||
};
|
||||
|
||||
EthereumProvider.prototype.scanQRCode = function (regex) {
|
||||
return sendAPIrequest('qr-code', {regex: regex});
|
||||
return sendAPIrequest('qr-code', { regex: regex });
|
||||
};
|
||||
|
||||
EthereumProvider.prototype.request = function (requestArguments) {
|
||||
if (window.statusAppDebug) {
|
||||
console.log("request: " + JSON.stringify(requestArguments));
|
||||
console.log('request: ' + JSON.stringify(requestArguments));
|
||||
}
|
||||
if (!requestArguments) {
|
||||
return Promise.reject(new Error('Request is not valid.'));
|
||||
|
|
@ -235,11 +230,11 @@
|
|||
return sendAPIrequest('web3');
|
||||
}
|
||||
|
||||
var syncResponse = getSyncResponse({method: method});
|
||||
var syncResponse = getSyncResponse({ method: method });
|
||||
if (syncResponse) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
if (window.statusAppDebug) {
|
||||
console.log("resolved sync method: " + method + ", result: " + JSON.stringify(syncResponse.result));
|
||||
console.log('resolved sync method: ' + method + ', result: ' + JSON.stringify(syncResponse.result));
|
||||
}
|
||||
resolve(syncResponse.result);
|
||||
});
|
||||
|
|
@ -248,15 +243,15 @@
|
|||
var messageId = callbackId++;
|
||||
var payload = {
|
||||
id: messageId,
|
||||
jsonrpc: "2.0",
|
||||
jsonrpc: '2.0',
|
||||
method: method,
|
||||
params: requestArguments.params
|
||||
params: requestArguments.params,
|
||||
};
|
||||
|
||||
bridgeSend({
|
||||
type: 'web3-send-async-read-only',
|
||||
messageId: messageId,
|
||||
payload: payload
|
||||
payload: payload,
|
||||
});
|
||||
|
||||
return new Promise(function (resolve, reject) {
|
||||
|
|
@ -264,7 +259,7 @@
|
|||
beta: true,
|
||||
method: method,
|
||||
resolve: resolve,
|
||||
reject: reject
|
||||
reject: reject,
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
@ -277,50 +272,51 @@
|
|||
//1.ethereum.send(payload: JsonRpcRequest, callback: JsonRpcCallback): void;
|
||||
//2.ethereum.send(payload: JsonRpcRequest): unknown;
|
||||
if (window.statusAppDebug) {
|
||||
console.log("send (legacy), payload: " + JSON.stringify(param1) + ", callback: " + param2);
|
||||
console.log('send (legacy), payload: ' + JSON.stringify(param1) + ', callback: ' + param2);
|
||||
}
|
||||
|
||||
var syncResponse = getSyncResponse(param1);
|
||||
if(syncResponse){
|
||||
if(param2){
|
||||
if (syncResponse) {
|
||||
if (param2) {
|
||||
param2(null, syncResponse);
|
||||
return;
|
||||
}else
|
||||
return syncResponse;
|
||||
} else return syncResponse;
|
||||
}
|
||||
|
||||
this.request(param1).then(result => {
|
||||
this.request(param1).then(
|
||||
(result) => {
|
||||
if (param2) {
|
||||
param2(null, web3SuccessResponse(param1, result));
|
||||
}
|
||||
}, reason => {
|
||||
},
|
||||
(reason) => {
|
||||
if (window.statusAppDebug) {
|
||||
console.log("send (legacy) failed. payload: " + JSON.stringify(param1) + ", reason: " + reason)
|
||||
console.log('send (legacy) failed. payload: ' + JSON.stringify(param1) + ', reason: ' + reason);
|
||||
}
|
||||
if (param2) {
|
||||
param2(reason, web3ErrorResponse(param1, reason))
|
||||
param2(reason, web3ErrorResponse(param1, reason));
|
||||
}
|
||||
});
|
||||
},
|
||||
);
|
||||
} else if (typeof param1 == 'string') {
|
||||
var method = param1;
|
||||
var params = param2;
|
||||
if (window.statusAppDebug) {
|
||||
console.log("send (legacy), method: " + method + ", params: " + JSON.stringify(params));
|
||||
console.log('send (legacy), method: ' + method + ', params: ' + JSON.stringify(params));
|
||||
}
|
||||
return this.request({method: method, params: params});
|
||||
return this.request({ method: method, params: params });
|
||||
} else {
|
||||
throw new Error("unsupported call to send, param1: " + param1 + ", param2: " + param2)
|
||||
}
|
||||
throw new Error('unsupported call to send, param1: ' + param1 + ', param2: ' + param2);
|
||||
}
|
||||
};
|
||||
|
||||
// (DEPRECATED) Support for legacy sendSync method
|
||||
EthereumProvider.prototype.sendSync = function (payload) {
|
||||
if (window.statusAppDebug) {
|
||||
console.log("sendSync (legacy)" + JSON.stringify(payload));
|
||||
console.log('sendSync (legacy)' + JSON.stringify(payload));
|
||||
}
|
||||
if (payload.method == "eth_uninstallFilter") {
|
||||
this.sendAsync(payload, function (res, err) {
|
||||
})
|
||||
if (payload.method == 'eth_uninstallFilter') {
|
||||
this.sendAsync(payload, function (res, err) {});
|
||||
}
|
||||
var syncResponse = getSyncResponse(payload);
|
||||
if (syncResponse) {
|
||||
|
|
@ -333,7 +329,7 @@
|
|||
// (DEPRECATED) Support for legacy sendAsync method
|
||||
EthereumProvider.prototype.sendAsync = function (payload, callback) {
|
||||
if (window.statusAppDebug) {
|
||||
console.log("sendAsync (legacy)" + JSON.stringify(payload));
|
||||
console.log('sendAsync (legacy)' + JSON.stringify(payload));
|
||||
}
|
||||
if (!payload) {
|
||||
return new Error('Request is not valid.');
|
||||
|
|
@ -351,21 +347,21 @@
|
|||
callbacks[messageId] = {
|
||||
num: payload.length,
|
||||
results: [],
|
||||
callback: callback
|
||||
callback: callback,
|
||||
};
|
||||
for (var i in payload) {
|
||||
bridgeSend({
|
||||
type: 'web3-send-async-read-only',
|
||||
messageId: messageId,
|
||||
payload: payload[i]
|
||||
payload: payload[i],
|
||||
});
|
||||
}
|
||||
} else {
|
||||
callbacks[messageId] = {callback: callback};
|
||||
callbacks[messageId] = { callback: callback };
|
||||
bridgeSend({
|
||||
type: 'web3-send-async-read-only',
|
||||
messageId: messageId,
|
||||
payload: payload
|
||||
payload: payload,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
import {useDerivedValue, runOnJS as reaRunOnJS, runOnJS} from "react-native-reanimated";
|
||||
import { useDerivedValue, runOnJS as reaRunOnJS, runOnJS } from 'react-native-reanimated';
|
||||
|
||||
export function useTranslateY(initialTranslationY, bottomSheetDy, panY) {
|
||||
return useDerivedValue(() => {
|
||||
return initialTranslationY - (bottomSheetDy.value - panY.value)
|
||||
})
|
||||
return initialTranslationY - (bottomSheetDy.value - panY.value);
|
||||
});
|
||||
}
|
||||
|
||||
export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight, opacity) {
|
||||
return useDerivedValue(() => {
|
||||
const calculatedOpacity = ((translateY.value - windowHeight) / -backgroundHeight) * opacity
|
||||
const calculatedOpacity = ((translateY.value - windowHeight) / -backgroundHeight) * opacity;
|
||||
|
||||
return Math.max(Math.min(calculatedOpacity, opacity), 0)
|
||||
})
|
||||
return Math.max(Math.min(calculatedOpacity, opacity), 0);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,24 +7,22 @@ import { useDerivedValue, interpolate } from 'react-native-reanimated';
|
|||
// 2. remove keys with nil value, else useAnimatedStyle will throw an error
|
||||
// https://github.com/status-im/status-mobile/issues/14756
|
||||
export function applyAnimationsToStyle(animations, style) {
|
||||
return function() {
|
||||
'worklet'
|
||||
return function () {
|
||||
'worklet';
|
||||
|
||||
var animatedStyle = {}
|
||||
var animatedStyle = {};
|
||||
|
||||
// Normal Style
|
||||
for (var key in style) {
|
||||
if (key == "transform") {
|
||||
if (key == 'transform') {
|
||||
var transforms = style[key];
|
||||
var filteredTransforms = []
|
||||
var filteredTransforms = [];
|
||||
|
||||
for (var transform of transforms) {
|
||||
var transformKey = Object.keys(transform)[0];
|
||||
var transformValue = transform[transformKey];
|
||||
if(transformValue !== null) {
|
||||
filteredTransforms.push(
|
||||
{[transformKey.replace(/-./g, x=>x[1].toUpperCase())]: transformValue}
|
||||
);
|
||||
if (transformValue !== null) {
|
||||
filteredTransforms.push({ [transformKey.replace(/-./g, (x) => x[1].toUpperCase())]: transformValue });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -32,24 +30,22 @@ export function applyAnimationsToStyle(animations, style) {
|
|||
} else {
|
||||
var value = style[key];
|
||||
if (value !== null) {
|
||||
animatedStyle[key.replace(/-./g, x=>x[1].toUpperCase())] = value;
|
||||
animatedStyle[key.replace(/-./g, (x) => x[1].toUpperCase())] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Animations
|
||||
for (var key in animations) {
|
||||
if (key == "transform") {
|
||||
if (key == 'transform') {
|
||||
var transforms = animations[key];
|
||||
var animatedTransforms = []
|
||||
var animatedTransforms = [];
|
||||
|
||||
for (var transform of transforms) {
|
||||
var transformKey = Object.keys(transform)[0];
|
||||
var transformValue = transform[transformKey].value;
|
||||
if (transformValue !== null) {
|
||||
animatedTransforms.push(
|
||||
{[transformKey.replace(/-./g, x=>x[1].toUpperCase())]: transformValue}
|
||||
);
|
||||
animatedTransforms.push({ [transformKey.replace(/-./g, (x) => x[1].toUpperCase())]: transformValue });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -57,20 +53,18 @@ export function applyAnimationsToStyle(animations, style) {
|
|||
} else {
|
||||
var animatedValue = animations[key].value;
|
||||
if (animatedValue !== null) {
|
||||
animatedStyle[key.replace(/-./g, x=>x[1].toUpperCase())] = animatedValue;
|
||||
animatedStyle[key.replace(/-./g, (x) => x[1].toUpperCase())] = animatedValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return animatedStyle;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
export function interpolateValue(sharedValue, inputRange, outputRange, extrapolation) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
return interpolate(sharedValue.value, inputRange, outputRange, extrapolation);
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
import { useDerivedValue } from 'react-native-reanimated';
|
||||
|
||||
export function infoLayout(input, isTop) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return isTop ? input.value : -input.value
|
||||
}
|
||||
);
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
return isTop ? input.value : -input.value;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,43 +5,39 @@ const slideAnimationDuration = 300;
|
|||
const easeOut = {
|
||||
duration: slideAnimationDuration,
|
||||
easing: Easing.bezier(0, 0, 0.58, 1),
|
||||
}
|
||||
};
|
||||
|
||||
// Derived Values
|
||||
export function dynamicProgressBarWidth(staticProgressBarWidth, progress) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return staticProgressBarWidth * (progress.value || 0) / 100;
|
||||
}
|
||||
);
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
return (staticProgressBarWidth * (progress.value || 0)) / 100;
|
||||
});
|
||||
}
|
||||
|
||||
export function carouselLeftPosition(windowWidth, progress) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
const progressValue = progress.value;
|
||||
switch (true) {
|
||||
case (progressValue < 25):
|
||||
case progressValue < 25:
|
||||
return 0;
|
||||
case (progressValue === 25):
|
||||
case progressValue === 25:
|
||||
return withTiming(-windowWidth, easeOut);
|
||||
case (progressValue < 50):
|
||||
case progressValue < 50:
|
||||
return -windowWidth;
|
||||
case (progressValue === 50):
|
||||
case progressValue === 50:
|
||||
return withTiming(-2 * windowWidth, easeOut);
|
||||
case (progressValue < 75):
|
||||
case progressValue < 75:
|
||||
return -2 * windowWidth;
|
||||
case (progressValue === 75):
|
||||
case progressValue === 75:
|
||||
return withTiming(-3 * windowWidth, easeOut);
|
||||
case (progressValue < 100):
|
||||
case progressValue < 100:
|
||||
return -3 * windowWidth;
|
||||
case (progressValue === 100):
|
||||
case progressValue === 100:
|
||||
return withTiming(-4 * windowWidth, easeOut);
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
import {
|
||||
useAnimatedStyle,
|
||||
useAnimatedSensor,
|
||||
withTiming,
|
||||
interpolate,
|
||||
SensorType
|
||||
} from 'react-native-reanimated';
|
||||
import { useAnimatedStyle, useAnimatedSensor, withTiming, interpolate, SensorType } from 'react-native-reanimated';
|
||||
import { Platform } from 'react-native';
|
||||
|
||||
const PI = Math.PI;
|
||||
|
|
@ -21,34 +15,31 @@ there is a bug with the pitch and roll calculations provided directly from the s
|
|||
be done using the quaternions directly.
|
||||
*/
|
||||
export function sensorAnimatedImage(zIndex, offset, stretch) {
|
||||
'worklet'
|
||||
const rotationSensor = useAnimatedSensor(SensorType.ROTATION, { interval: 30 })
|
||||
'worklet';
|
||||
const rotationSensor = useAnimatedSensor(SensorType.ROTATION, { interval: 30 });
|
||||
return useAnimatedStyle(function () {
|
||||
|
||||
const { qx, qz, qw, qy, pitch } = rotationSensor.sensor.value;
|
||||
|
||||
const roll = Math.asin(-2.0 * (qx * qz - qw * qy))
|
||||
const roll = Math.asin(-2.0 * (qx * qz - qw * qy));
|
||||
|
||||
const translateY = withTiming(
|
||||
interpolate(
|
||||
pitch,
|
||||
Platform.OS === 'ios' ? [-PI, PI] : [PI, -PI],
|
||||
[(-offset * 3) / zIndex - offset + (offset - stretch), (offset * 3) / zIndex - offset + (offset - stretch)]),
|
||||
{ duration: 10 }
|
||||
interpolate(pitch, Platform.OS === 'ios' ? [-PI, PI] : [PI, -PI], [
|
||||
(-offset * 3) / zIndex - offset + (offset - stretch),
|
||||
(offset * 3) / zIndex - offset + (offset - stretch),
|
||||
]),
|
||||
{ duration: 10 },
|
||||
);
|
||||
const translateX = withTiming(
|
||||
interpolate(
|
||||
roll,
|
||||
[1, -1],
|
||||
[(-offset * 2) / zIndex - offset + (offset - stretch), (offset * 2) / zIndex - offset + (offset - stretch)]),
|
||||
{ duration: 10 }
|
||||
[(-offset * 2) / zIndex - offset + (offset - stretch), (offset * 2) / zIndex - offset + (offset - stretch)],
|
||||
),
|
||||
{ duration: 10 },
|
||||
);
|
||||
|
||||
return {
|
||||
transform: [
|
||||
{ translateX },
|
||||
{ translateY }
|
||||
]
|
||||
}
|
||||
})
|
||||
transform: [{ translateX }, { translateY }],
|
||||
};
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@ import { useDerivedValue } from 'react-native-reanimated';
|
|||
const MAX_SCALE = 1.8;
|
||||
|
||||
export function ringScale(scale, subtract) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
const value = scale.value;
|
||||
const maxDelta = MAX_SCALE - 1;
|
||||
const maxDeltaDiff = 1 - maxDelta;
|
||||
const maxVirtualScale = MAX_SCALE + maxDelta;
|
||||
const decimals = value - Math.floor(value);
|
||||
const normalizedValue = value >= maxVirtualScale ? (decimals + ((parseInt(value) - 1) * maxDeltaDiff) + 1) : value;
|
||||
return (((normalizedValue - subtract) > MAX_SCALE ? normalizedValue - maxDelta : normalizedValue) - subtract);
|
||||
}
|
||||
);
|
||||
const normalizedValue = value >= maxVirtualScale ? decimals + (parseInt(value) - 1) * maxDeltaDiff + 1 : value;
|
||||
return (normalizedValue - subtract > MAX_SCALE ? normalizedValue - maxDelta : normalizedValue) - subtract;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {useAnimatedScrollHandler} from "react-native-reanimated";
|
||||
import { useAnimatedScrollHandler } from 'react-native-reanimated';
|
||||
|
||||
export function useAnimatedScrollHandlerWorklet(scrollY) {
|
||||
return useAnimatedScrollHandler((event) => {
|
||||
scrollY.value = event.contentOffset.y;
|
||||
})
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,34 @@
|
|||
import { useDerivedValue, withTiming } from 'react-native-reanimated';
|
||||
import * as constants from './constants';
|
||||
|
||||
export function bottomTabIconColor(stackId, selectedStackId, homeStackState,
|
||||
passThrough, selectedTabColor, defaultColor,
|
||||
passThroughColor) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
export function bottomTabIconColor(
|
||||
stackId,
|
||||
selectedStackId,
|
||||
homeStackState,
|
||||
passThrough,
|
||||
selectedTabColor,
|
||||
defaultColor,
|
||||
passThroughColor,
|
||||
) {
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
var homeStackStateValue = homeStackState.value;
|
||||
if (selectedStackId.value == stackId &&
|
||||
(homeStackStateValue == constants.OPEN_WITH_ANIMATION ||
|
||||
homeStackStateValue == constants.OPEN_WITHOUT_ANIMATION)){
|
||||
if (
|
||||
selectedStackId.value == stackId &&
|
||||
(homeStackStateValue == constants.OPEN_WITH_ANIMATION || homeStackStateValue == constants.OPEN_WITHOUT_ANIMATION)
|
||||
) {
|
||||
return selectedTabColor;
|
||||
}
|
||||
else if (passThrough.value){
|
||||
} else if (passThrough.value) {
|
||||
return passThroughColor;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return defaultColor;
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export function bottomTabsHeight(homeStackState, height, extendedHeight) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (homeStackState.value) {
|
||||
case constants.OPEN_WITH_ANIMATION:
|
||||
return withTiming(extendedHeight, constants.LINEAR_EASING);
|
||||
|
|
@ -41,6 +43,5 @@ export function bottomTabsHeight(homeStackState, height, extendedHeight) {
|
|||
return height;
|
||||
break;
|
||||
}
|
||||
}
|
||||
)
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ export const SHELL_ANIMATION_TIME = 200;
|
|||
export const LINEAR_EASING = {
|
||||
duration: SHELL_ANIMATION_TIME,
|
||||
easing: Easing.bezier(0, 0, 1, 1),
|
||||
}
|
||||
};
|
||||
|
||||
export const EASE_OUT_EASING = {
|
||||
duration: SHELL_ANIMATION_TIME,
|
||||
easing: Easing.bezier(0, 0, 0.58, 1),
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,10 +2,9 @@ import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 're
|
|||
import * as constants from './constants';
|
||||
|
||||
// Derived Values
|
||||
export function screenLeft (screenState, screenWidth, switcherCardLeftPosition) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
export function screenLeft(screenState, screenWidth, switcherCardLeftPosition) {
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (screenState.value) {
|
||||
case constants.CLOSE_SCREEN_WITH_SLIDE_ANIMATION:
|
||||
return withTiming(screenWidth, constants.EASE_OUT_EASING);
|
||||
|
|
@ -16,7 +15,7 @@ export function screenLeft (screenState, screenWidth, switcherCardLeftPosition)
|
|||
case constants.OPEN_SCREEN_WITHOUT_ANIMATION:
|
||||
// Note - don't use return 0; its not working in ios
|
||||
// https://github.com/software-mansion/react-native-reanimated/issues/3296#issuecomment-1573900172
|
||||
return withSequence(withTiming(-1, {duration: 0}), withTiming(0, {duration: 0}));
|
||||
return withSequence(withTiming(-1, { duration: 0 }), withTiming(0, { duration: 0 }));
|
||||
case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
|
||||
return withTiming(switcherCardLeftPosition, constants.EASE_OUT_EASING);
|
||||
case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
|
||||
|
|
@ -27,10 +26,9 @@ export function screenLeft (screenState, screenWidth, switcherCardLeftPosition)
|
|||
});
|
||||
}
|
||||
|
||||
export function screenTop (screenState, switcherCardTopPosition) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
export function screenTop(screenState, switcherCardTopPosition) {
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (screenState.value) {
|
||||
case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
|
||||
return withTiming(switcherCardTopPosition, constants.EASE_OUT_EASING);
|
||||
|
|
@ -42,44 +40,47 @@ export function screenTop (screenState, switcherCardTopPosition) {
|
|||
});
|
||||
}
|
||||
|
||||
export function screenWidth (screenState, screenWidth, switcherCardSize) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
export function screenWidth(screenState, screenWidth, switcherCardSize) {
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (screenState.value) {
|
||||
case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
|
||||
return withTiming(switcherCardSize, constants.EASE_OUT_EASING);
|
||||
case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
|
||||
return withSequence(withTiming(switcherCardSize, {duration: 0}), withTiming(screenWidth, constants.EASE_OUT_EASING));
|
||||
return withSequence(
|
||||
withTiming(switcherCardSize, { duration: 0 }),
|
||||
withTiming(screenWidth, constants.EASE_OUT_EASING),
|
||||
);
|
||||
default:
|
||||
return screenWidth;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
export function screenHeight (screenState, screenHeight, switcherCardSize) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
export function screenHeight(screenState, screenHeight, switcherCardSize) {
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (screenState.value) {
|
||||
case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
|
||||
return withTiming(switcherCardSize, constants.EASE_OUT_EASING);
|
||||
case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
|
||||
return withSequence(withTiming(switcherCardSize, {duration: 0}), withTiming(screenHeight, constants.EASE_OUT_EASING));
|
||||
return withSequence(
|
||||
withTiming(switcherCardSize, { duration: 0 }),
|
||||
withTiming(screenHeight, constants.EASE_OUT_EASING),
|
||||
);
|
||||
default:
|
||||
return screenHeight;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
export function screenZIndex (screenState) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
export function screenZIndex(screenState) {
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (screenState.value) {
|
||||
case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
|
||||
case constants.CLOSE_SCREEN_WITH_SLIDE_ANIMATION:
|
||||
return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(-1, {duration: 0}));
|
||||
return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(-1, { duration: 0 }));
|
||||
case constants.CLOSE_SCREEN_WITHOUT_ANIMATION:
|
||||
return -1;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -3,28 +3,23 @@ import * as constants from './constants';
|
|||
|
||||
// Derived values for each stack (communities, chat, wallet, browser)
|
||||
export function stackOpacity(stackId, selectedStackId) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
return selectedStackId.value == stackId ? 1 : 0;
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export function stackZIndex(stackId, selectedStackId) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
return selectedStackId.value == stackId ? 10 : 9;
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
// Derived values for home stack (container)
|
||||
export function homeStackOpacity(homeStackState) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (homeStackState.value) {
|
||||
case constants.OPEN_WITH_ANIMATION:
|
||||
return withTiming(1, constants.LINEAR_EASING);
|
||||
|
|
@ -35,14 +30,12 @@ export function homeStackOpacity(homeStackState) {
|
|||
case constants.CLOSE_WITHOUT_ANIMATION:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export function homeStackTop(homeStackState, top) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (homeStackState.value) {
|
||||
case constants.OPEN_WITH_ANIMATION:
|
||||
return withTiming(0, constants.LINEAR_EASING);
|
||||
|
|
@ -53,19 +46,17 @@ export function homeStackTop(homeStackState, top) {
|
|||
case constants.CLOSE_WITHOUT_ANIMATION:
|
||||
return top;
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export function homeStackLeft(selectedStackId, animateHomeStackLeft, homeStackState, left) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
if (animateHomeStackLeft.value) {
|
||||
var leftValue = left[selectedStackId.value];
|
||||
switch (homeStackState.value) {
|
||||
case constants.OPEN_WITH_ANIMATION:
|
||||
return withSequence(withTiming(leftValue, {duration: 0}), withTiming(0, constants.LINEAR_EASING))
|
||||
return withSequence(withTiming(leftValue, { duration: 0 }), withTiming(0, constants.LINEAR_EASING));
|
||||
case constants.CLOSE_WITH_ANIMATION:
|
||||
return withTiming(leftValue, constants.LINEAR_EASING);
|
||||
case constants.OPEN_WITHOUT_ANIMATION:
|
||||
|
|
@ -76,25 +67,23 @@ export function homeStackLeft(selectedStackId, animateHomeStackLeft, homeStackSt
|
|||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
export function homeStackPointer(homeStackState) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
var homeStackStateValue = homeStackState.value;
|
||||
return (homeStackStateValue == constants.OPEN_WITH_ANIMATION ||
|
||||
homeStackStateValue == constants.OPEN_WITHOUT_ANIMATION) ? "auto" : "none";
|
||||
}
|
||||
);
|
||||
return homeStackStateValue == constants.OPEN_WITH_ANIMATION ||
|
||||
homeStackStateValue == constants.OPEN_WITHOUT_ANIMATION
|
||||
? 'auto'
|
||||
: 'none';
|
||||
});
|
||||
}
|
||||
|
||||
export function homeStackScale(homeStackState, minimizeScale) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (homeStackState.value) {
|
||||
case constants.OPEN_WITH_ANIMATION:
|
||||
return withTiming(1, constants.LINEAR_EASING);
|
||||
|
|
@ -105,24 +94,20 @@ export function homeStackScale(homeStackState, minimizeScale) {
|
|||
case constants.CLOSE_WITHOUT_ANIMATION:
|
||||
return minimizeScale;
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export function homeStackBorderRadius(homeStackState) {
|
||||
return useDerivedValue(
|
||||
function () {
|
||||
'worklet'
|
||||
return useDerivedValue(function () {
|
||||
'worklet';
|
||||
switch (homeStackState.value) {
|
||||
case constants.OPEN_WITH_ANIMATION:
|
||||
return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(0, {duration: 0}));
|
||||
return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(0, { duration: 0 }));
|
||||
case constants.CLOSE_WITH_ANIMATION:
|
||||
case constants.CLOSE_WITHOUT_ANIMATION:
|
||||
return 20;
|
||||
case constants.OPEN_WITHOUT_ANIMATION:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
const waitToNavigate = duration => new Promise(resolve => setTimeout(() => resolve(), duration));
|
||||
const waitToNavigate = (duration) => new Promise((resolve) => setTimeout(() => resolve(), duration));
|
||||
|
||||
const SUPER_SECRET_PASSWORD = 'password'
|
||||
const SUPER_SECRET_PASSWORD = 'password';
|
||||
|
||||
const loginToHomePage = async () => {
|
||||
if (device.getPlatform() === 'ios') {
|
||||
await device.setStatusBar({ time: '12:34', dataNetwork: 'wifi', wifiBars: '3', batteryState: 'charging', batteryLevel: '100' });
|
||||
await device.setStatusBar({
|
||||
time: '12:34',
|
||||
dataNetwork: 'wifi',
|
||||
wifiBars: '3',
|
||||
batteryState: 'charging',
|
||||
batteryLevel: '100',
|
||||
});
|
||||
}
|
||||
await device.reloadReactNative();
|
||||
await element(by.id('terms-of-service')).tap();
|
||||
|
|
@ -21,18 +27,17 @@ const loginToHomePage = async () => {
|
|||
await element(by.id('confirm-password-placeholder')).typeText(SUPER_SECRET_PASSWORD);
|
||||
await element(by.text('Next')).tap();
|
||||
await waitToNavigate(200);
|
||||
await element(by.id("browser-stack")).tap();
|
||||
await element(by.id('browser-stack')).tap();
|
||||
await waitToNavigate(400);
|
||||
await element(by.text("Quo2.0 Preview")).tap();
|
||||
await element(by.text('Quo2.0 Preview')).tap();
|
||||
await waitToNavigate(400);
|
||||
}
|
||||
};
|
||||
|
||||
describe('Default Renders', () => {
|
||||
beforeAll(async () => loginToHomePage())
|
||||
beforeEach(async () => {
|
||||
});
|
||||
beforeAll(async () => loginToHomePage());
|
||||
beforeEach(async () => {});
|
||||
afterEach(async () => {
|
||||
await element(by.id("back-button")).tap();
|
||||
await element(by.id('back-button')).tap();
|
||||
await waitToNavigate(200);
|
||||
});
|
||||
|
||||
|
|
@ -40,5 +45,5 @@ describe('Default Renders', () => {
|
|||
await element(by.id(`quo2-:button`)).tap();
|
||||
await waitToNavigate(200);
|
||||
const res = await jestExpect(`button`).toMatchImageSnapshot();
|
||||
})
|
||||
});
|
||||
});
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
var Mocks = require('../target/mocks/mocks.js');
|
||||
var Module = require('module');
|
||||
process.env.TZ = 'Etc/UTC'
|
||||
process.env.TZ = 'Etc/UTC';
|
||||
|
||||
const originalLoader = Module._load;
|
||||
|
||||
|
|
@ -18,13 +18,11 @@ Module._load = function hookedLoader(request, parent, isMain) {
|
|||
|
||||
var originalRequire = Module.prototype.require;
|
||||
|
||||
Module.prototype.require = function(req){
|
||||
Module.prototype.require = function (req) {
|
||||
module = Mocks.mocks(req);
|
||||
if (module == null) {
|
||||
return originalRequire.apply(this, arguments);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return module;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
module.exports = {
|
||||
preset: 'react-native',
|
||||
setupFilesAfterEnv: [
|
||||
'@testing-library/jest-native/extend-expect',
|
||||
'../test/jest/jestSetup.js',
|
||||
],
|
||||
setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect', '../test/jest/jestSetup.js'],
|
||||
setupFiles: [],
|
||||
testPathIgnorePatterns: [],
|
||||
moduleNameMapper: {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
const WebSocket = require('ws');
|
||||
const {NativeModules} = require('react-native');
|
||||
const { NativeModules } = require('react-native');
|
||||
|
||||
require('@react-native-async-storage/async-storage/jest/async-storage-mock');
|
||||
require('react-native-gesture-handler/jestSetup');
|
||||
|
|
@ -8,8 +8,8 @@ require('react-native-reanimated/lib/reanimated2/jestUtils').setUpTests();
|
|||
jest.mock('@react-native-async-storage/async-storage', () => mockAsyncStorage);
|
||||
|
||||
jest.mock('react-native-navigation', () => ({
|
||||
getNavigationConstants: () => ({constants: []}),
|
||||
Navigation: {constants: async () => {}},
|
||||
getNavigationConstants: () => ({ constants: [] }),
|
||||
Navigation: { constants: async () => {} },
|
||||
}));
|
||||
|
||||
jest.mock('react-native-background-timer', () => ({}));
|
||||
|
|
@ -25,9 +25,7 @@ jest.mock('react-native-languages', () => ({
|
|||
},
|
||||
}));
|
||||
|
||||
jest.mock('react-native-permissions', () =>
|
||||
require('react-native-permissions/mock'),
|
||||
);
|
||||
jest.mock('react-native-permissions', () => require('react-native-permissions/mock'));
|
||||
|
||||
jest.mock('@react-native-community/audio-toolkit', () => ({
|
||||
Recorder: jest.fn().mockImplementation(() => ({
|
||||
|
|
@ -61,21 +59,21 @@ jest.mock('@react-native-community/audio-toolkit', () => ({
|
|||
PlaybackCategories: {
|
||||
Playback: 1,
|
||||
Ambient: 2,
|
||||
SoloAmbient: 3
|
||||
SoloAmbient: 3,
|
||||
},
|
||||
}));
|
||||
|
||||
jest.mock("i18n-js", () => ({
|
||||
...jest.requireActual("i18n-js"),
|
||||
t: (label) => `tx:${label}`
|
||||
jest.mock('i18n-js', () => ({
|
||||
...jest.requireActual('i18n-js'),
|
||||
t: (label) => `tx:${label}`,
|
||||
}));
|
||||
|
||||
jest.mock("react-native-blob-util", () => ({
|
||||
jest.mock('react-native-blob-util', () => ({
|
||||
default: {
|
||||
config: jest.fn().mockReturnValue({
|
||||
fetch: jest.fn()
|
||||
})
|
||||
}
|
||||
fetch: jest.fn(),
|
||||
}),
|
||||
},
|
||||
}));
|
||||
|
||||
NativeModules.ReactLocalization = {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
const {
|
||||
DetoxCircusEnvironment,
|
||||
SpecReporter,
|
||||
WorkerAssignReporter,
|
||||
} = require('detox/runners/jest-circus');
|
||||
const { DetoxCircusEnvironment, SpecReporter, WorkerAssignReporter } = require('detox/runners/jest-circus');
|
||||
|
||||
class CustomDetoxEnvironment extends DetoxCircusEnvironment {
|
||||
class CustomDetoxEnvironment extends DetoxCircusEnvironment {
|
||||
constructor(config, context) {
|
||||
super(config, context);
|
||||
|
||||
|
|
@ -18,6 +14,6 @@ const {
|
|||
WorkerAssignReporter,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = CustomDetoxEnvironment;
|
||||
module.exports = CustomDetoxEnvironment;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ function resolveSelectedConfiguration() {
|
|||
|
||||
// TODO eventually, this should be made available by Detox more explicitly
|
||||
function isAndroidConfig(config) {
|
||||
return [config.type, process.env.DETOX_CONFIGURATION, config.device].some(s => `${s}`.includes('android'));
|
||||
return [config.type, process.env.DETOX_CONFIGURATION, config.device].some((s) => `${s}`.includes('android'));
|
||||
}
|
||||
|
||||
module.exports = globalSetup;
|
||||
|
|
@ -4,12 +4,12 @@ const path = require('path');
|
|||
const kebabCase = require('lodash/kebabCase');
|
||||
const expect = require('expect');
|
||||
|
||||
|
||||
const toMatchImage = configureToMatchImageSnapshot({
|
||||
comparisonMethod: 'ssim', failureThreshold: 0.002, failureThresholdType: 'percent'
|
||||
comparisonMethod: 'ssim',
|
||||
failureThreshold: 0.002,
|
||||
failureThresholdType: 'percent',
|
||||
});
|
||||
|
||||
|
||||
expect.extend({ toMatchImage });
|
||||
|
||||
expect.extend({
|
||||
|
|
@ -23,18 +23,17 @@ expect.extend({
|
|||
const { testPath, currentTestName } = this;
|
||||
|
||||
const customSnapshotsDir = path.join(path.dirname(testPath), SNAPSHOTS_DIR);
|
||||
const customSnapshotIdentifier = kebabCase(`${path.basename(testPath)}-${currentTestName}-${screenName}`)
|
||||
const customSnapshotIdentifier = kebabCase(`${path.basename(testPath)}-${currentTestName}-${screenName}`);
|
||||
|
||||
const tempPath = await device.takeScreenshot(screenName);
|
||||
const image = fs.readFileSync(tempPath);
|
||||
expect(image).toMatchImage({ customSnapshotIdentifier, customSnapshotsDir });
|
||||
|
||||
return { pass: true }
|
||||
return { pass: true };
|
||||
},
|
||||
});
|
||||
|
||||
global.jestExpect = expect
|
||||
|
||||
global.jestExpect = expect;
|
||||
|
||||
beforeAll(async () => {
|
||||
await device.launchApp();
|
||||
|
|
|
|||
|
|
@ -8664,6 +8664,11 @@ prepend-http@^2.0.0:
|
|||
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
|
||||
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
|
||||
|
||||
prettier@^2.8.8:
|
||||
version "2.8.8"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
|
||||
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
|
||||
|
||||
pretty-format@^25.5.0:
|
||||
version "25.5.0"
|
||||
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
|
||||
|
|
|
|||
Loading…
Reference in New Issue