Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(Cross): [IOAPPX-217] Add NativeStackNavigator to the Design System section #5424

Merged
merged 51 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
b9bc587
wip refactoring on r-nav upgrade
CrisTofani Jan 18, 2024
f5a8b09
Merge remote-tracking branch 'origin/master' into upgrade-navigation-v6
CrisTofani Jan 18, 2024
d953788
wip continue refactoring for upgrade
CrisTofani Jan 18, 2024
83272ee
wip refactoring
CrisTofani Jan 18, 2024
cbd22dd
chore: update
hevelius Jan 18, 2024
52c972c
chore: update
hevelius Jan 18, 2024
ee61e69
chore: latest removes
CrisTofani Jan 18, 2024
83ad5a0
fix: build issues
LazyAfternoons Jan 18, 2024
fdfe4f8
Revert "fix: build issues"
LazyAfternoons Jan 18, 2024
d8370d6
fix: build issues second attempt
LazyAfternoons Jan 18, 2024
353a32c
chore: finally upgrade react-navigation v6
CrisTofani Jan 19, 2024
4bd77a8
Merge remote-tracking branch 'origin/master' into upgrade-navigation-v6
CrisTofani Jan 19, 2024
29d3980
add babel transform class plugin
CrisTofani Jan 19, 2024
a27a021
updates snapshots
CrisTofani Jan 19, 2024
0143cf7
revert babel upgrade
CrisTofani Jan 19, 2024
4936254
fixes test execution
CrisTofani Jan 19, 2024
fe4f045
Merge branch 'master' into upgrade-navigation-v6
CrisTofani Jan 19, 2024
7d7beda
removes patch note
CrisTofani Jan 19, 2024
0960cdb
Merge branch 'master' into upgrade-navigation-v6
shadowsheep1 Jan 19, 2024
54111e5
prettify fix
CrisTofani Jan 19, 2024
d4abf89
Merge branch 'master' into upgrade-navigation-v6
CrisTofani Jan 19, 2024
4fd9f34
Merge branch 'master' into upgrade-navigation-v6
CrisTofani Jan 19, 2024
7d1beca
build: another attempt to fix build issues
LazyAfternoons Jan 19, 2024
4d3858c
fix: new wallet headers
mastro993 Jan 19, 2024
81530b8
build: attempt to fix tests
LazyAfternoons Jan 19, 2024
db0583d
build: attempt to fix tests in CI
LazyAfternoons Jan 19, 2024
b83f627
Revert "build: attempt to fix tests in CI"
LazyAfternoons Jan 19, 2024
a573b91
Revert "build: attempt to fix tests"
LazyAfternoons Jan 19, 2024
523e260
Revert "build: another attempt to fix build issues"
LazyAfternoons Jan 19, 2024
edf8b33
build: downgrading dependencies to fix build issues
LazyAfternoons Jan 19, 2024
aa2edc5
Merge branch 'master' into upgrade-navigation-v6
dmnplb Jan 22, 2024
7f1cf77
Add `NativeStackNavigator` to the Design System section
dmnplb Jan 23, 2024
3866add
Set primary color based on DS experimental flag to `react-navigation`
dmnplb Jan 23, 2024
ff13c94
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Feb 12, 2024
cc5321b
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Mar 14, 2024
be05979
Fix divider in the DS list items of the Developer Mode section
dmnplb Mar 14, 2024
6cfcbd2
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Mar 15, 2024
4472b13
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
CrisTofani Mar 18, 2024
c5baafd
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Mar 19, 2024
f08ed27
Merge remote-tracking branch 'origin/master' into IACROSS-217-remove-…
CrisTofani Apr 2, 2024
22dc4fe
revert unwanted pod updates
CrisTofani Apr 2, 2024
cb8e2a7
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Apr 3, 2024
f93271d
Update `jest` snapshots
dmnplb Apr 3, 2024
4a910a8
fixes test executiion
CrisTofani Apr 3, 2024
ba1cf49
fixes snaps
CrisTofani Apr 3, 2024
7af4df0
Align branch to master
dmnplb Apr 10, 2024
1c6dc90
align branch to master
adelloste Apr 10, 2024
feb4c42
Update snapshots and `Podfile.lock`
dmnplb Apr 10, 2024
b87e1e7
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Apr 11, 2024
e3047e0
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Apr 11, 2024
ebcc7e7
Merge branch 'master' into IACROSS-217-remove-nested-navigator-design…
dmnplb Apr 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,9 @@ PODS:
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (2.18.1):
- RNScreens (3.30.1):
- React-Core
- React-RCTImage
- RNSha256 (1.2.3):
- React
- RNShare (7.3.9):
Expand Down Expand Up @@ -1009,7 +1010,7 @@ SPEC CHECKSUMS:
RNQrGenerator: 1676221c08bfabec978242989c733810dad20959
RNReactNativeHapticFeedback: 6d24decfa94e037c2ecc312407d2a057b7933f10
RNReanimated: 60e291d42c77752a0f6d6f358387bdf225a87c6e
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
RNScreens: 848541d154d2a184131b34e468b10aa33008f357
RNSha256: ab608b2185fb806185a2cc112e0474065842e085
RNShare: 807d6f8231b8ebcf6dd839294b877342eb93d4e5
RNSVG: 50cf2c7018e57cf5d3522d98d0a3a4dd6bf9d093
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
"@react-navigation/bottom-tabs": "6.5.11",
"@react-navigation/material-top-tabs": "6.6.5",
"@react-navigation/native": "6.1.9",
"@react-navigation/native-stack": "^6.9.17",
"@react-navigation/stack": "6.3.20",
"@redux-saga/testing-utils": "^1.1.3",
"@xstate/react": "^3.0.1",
Expand Down Expand Up @@ -175,7 +176,7 @@
"react-native-responsive-screen": "^1.4.1",
"react-native-safe-area-context": "^3.3.2",
"react-native-screen-brightness": "^2.0.0-alpha",
"react-native-screens": "^2.18.1",
"react-native-screens": "^3.30.1",
"react-native-sha256": "1.2.3",
"react-native-share": "7.3.9",
"react-native-splash-screen": "^3.2.0",
Expand Down
15 changes: 8 additions & 7 deletions ts/components/DebugInfoOverlay.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import * as React from "react";
import { StyleSheet, Pressable, SafeAreaView, View, Text } from "react-native";
import { connect } from "react-redux";
import { useState } from "react";
import { widthPercentageToDP } from "react-native-responsive-screen";
import {
HSpacer,
IOColors,
IOStyles,
hexToRgba,
makeFontStyleObject
} from "@pagopa/io-app-design-system";
import * as React from "react";
import { useState } from "react";
import { Pressable, SafeAreaView, StyleSheet, Text, View } from "react-native";
import { widthPercentageToDP } from "react-native-responsive-screen";
import { connect } from "react-redux";
import { ReduxProps } from "../store/actions/types";
import { useIOSelector } from "../store/hooks";
import { currentRouteSelector } from "../store/reducers/navigation";
import { isPagoPATestEnabledSelector } from "../store/reducers/persistedPreferences";
import { GlobalState } from "../store/reducers/types";
import { getAppVersion } from "../utils/appVersion";
import { clipboardSetStringWithFeedback } from "../utils/clipboard";
import { useIOSelector } from "../store/hooks";
import { isPagoPATestEnabledSelector } from "../store/reducers/persistedPreferences";
import PagoPATestIndicator from "./PagoPATestIndicator";

type Props = ReturnType<typeof mapStateToProps> & ReduxProps;
Expand All @@ -27,6 +27,7 @@ const debugItemBorderColor = hexToRgba(IOColors.black, 0.1);
const styles = StyleSheet.create({
versionContainer: {
...StyleSheet.absoluteFillObject,
top: -8,
justifyContent: "flex-start",
alignItems: "center",
zIndex: 1000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,33 @@ exports[`OperationResultScreenContent should match the snapshot with default pro
</View>
</View>
</View>
<View
<RNSScreenContainer
onLayout={[Function]}
style={
Object {
"flex": 1,
}
}
>
<View
<RNSModalScreen
activityState={2}
collapsable={false}
forwardedRef={[Function]}
gestureResponseDistance={
Object {
"bottom": -1,
"end": -1,
"start": -1,
"top": -1,
}
}
onGestureCancel={[Function]}
pointerEvents="box-none"
sheetAllowedDetents="large"
sheetCornerRadius={-1}
sheetExpandsWhenScrolledToEdge={true}
sheetGrabberVisible={false}
sheetLargestUndimmedDetent="all"
style={
Object {
"bottom": 0,
Expand Down Expand Up @@ -668,8 +682,8 @@ exports[`OperationResultScreenContent should match the snapshot with default pro
</View>
</View>
</View>
</View>
</View>
</RNSModalScreen>
</RNSScreenContainer>
</View>
</RNCSafeAreaProvider>
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { ServiceId } from "../../../../../definitions/backend/ServiceId";
import { ServicePublic } from "../../../../../definitions/backend/ServicePublic";
import { BonusAvailable } from "../../../../../definitions/content/BonusAvailable";
import ItemSeparatorComponent from "../../../../components/ItemSeparatorComponent";
import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";
import { IOStyles } from "../../../../components/core/variables/IOStyles";
import BaseScreenComponent, {
ContextualHelpPropsMarkdown
Expand Down Expand Up @@ -56,7 +57,6 @@ import {
supportedAvailableBonusSelector
} from "../store/selectors";
import { ID_CDC_TYPE, ID_CGN_TYPE } from "../utils";
import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";
import { ServiceDetailsScreenNavigationParams } from "../../../services/screens/ServiceDetailsScreen";

export type Props = ReturnType<typeof mapStateToProps> &
Expand Down
14 changes: 7 additions & 7 deletions ts/features/design-system/DesignSystem.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { SectionList, StatusBar, View, useColorScheme } from "react-native";
import * as React from "react";
import {
useIOTheme,
Divider,
VSpacer,
IOStyles,
IOVisualCostants,
ListItemNav,
IOVisualCostants
VSpacer,
useIOTheme
} from "@pagopa/io-app-design-system";
import { IOStyles } from "../../components/core/variables/IOStyles";
import { useIONavigation } from "../../navigation/params/AppParamsList";
import * as React from "react";
import { SectionList, StatusBar, View, useColorScheme } from "react-native";
import { H1 } from "../../components/core/typography/H1";
import { LabelSmall } from "../../components/core/typography/LabelSmall";
import { useIONavigation } from "../../navigation/params/AppParamsList";
import DESIGN_SYSTEM_ROUTES from "./navigation/routes";

type SingleSectionProps = {
Expand Down
17 changes: 9 additions & 8 deletions ts/features/design-system/core/DSNumberPad.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import * as React from "react";
import {
Body,
CodeInput,
H2,
IOColors,
ListItemSwitch,
NumberPad,
VSpacer,
hexToRgba,
LabelSmallAlt,
IOVisualCostants,
LabelLink,
LabelSmallAlt,
ListItemSwitch,
NumberPad,
Pictogram,
Body
VSpacer,
hexToRgba
} from "@pagopa/io-app-design-system";
import { useNavigation } from "@react-navigation/native";
import { Alert, View } from "react-native";
import * as React from "react";
import { Alert, StatusBar, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";

const PIN_LENGTH = 6;
Expand Down Expand Up @@ -59,6 +59,7 @@ export const DSNumberPad = () => {
}
]}
>
<StatusBar barStyle={darkBackground ? "light-content" : "default"} />
<View
style={{
backgroundColor: IOColors.white,
Expand Down
Loading
Loading