From 9baf8bf848c5b8d590631e9ccf1b729c2ef52db7 Mon Sep 17 00:00:00 2001 From: mikeCyb Date: Tue, 7 May 2024 21:53:51 +0300 Subject: [PATCH 01/14] favorite pack and pack score fix --- packages/app/components/ScoreContainer.tsx | 14 +++++++++----- packages/app/components/feed/FeedCard.tsx | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/app/components/ScoreContainer.tsx b/packages/app/components/ScoreContainer.tsx index f0cc679b1..bae25659b 100644 --- a/packages/app/components/ScoreContainer.tsx +++ b/packages/app/components/ScoreContainer.tsx @@ -203,7 +203,7 @@ export const ScoreContainer: React.FC = ({ {isAlreadyScored ? title : 'Score this pack!'} - {subheader} + {subheader} {description} {isOwner && ( @@ -236,11 +236,11 @@ const loadStyles = (theme: any) => { alignItems: 'center', }, vStack: { - justifyContent: 'center', - alignItems: 'flex-start', - width: Platform.OS == 'web' ? '60%' : '100%', + justifyContent: 'space-between', + alignItems: 'center', + width: '100%', }, - scoreText: { + scoreText: {ustifyContent: 'space-between', color: currentTheme.colors.textPrimary, fontSize: 26, fontWeight: 'bold', @@ -266,6 +266,10 @@ const loadStyles = (theme: any) => { fontWeight: '700', fontSize: 24, }, + subheader: { + display:'inline-block', + textAlignVertical: 'center', + } }; }; diff --git a/packages/app/components/feed/FeedCard.tsx b/packages/app/components/feed/FeedCard.tsx index 2e802a904..6a8f74941 100644 --- a/packages/app/components/feed/FeedCard.tsx +++ b/packages/app/components/feed/FeedCard.tsx @@ -281,7 +281,7 @@ export default function Card({ gap: 8, }} > - {user?.id === owner_id ? null : ( + - )} + Date: Wed, 8 May 2024 11:20:00 +0300 Subject: [PATCH 02/14] favorite pack and pack score fix --- packages/app/components/ScoreContainer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/components/ScoreContainer.tsx b/packages/app/components/ScoreContainer.tsx index bae25659b..b1d866c15 100644 --- a/packages/app/components/ScoreContainer.tsx +++ b/packages/app/components/ScoreContainer.tsx @@ -240,7 +240,7 @@ const loadStyles = (theme: any) => { alignItems: 'center', width: '100%', }, - scoreText: {ustifyContent: 'space-between', + scoreText: { color: currentTheme.colors.textPrimary, fontSize: 26, fontWeight: 'bold', From 053941ad65e112b1719969eef66e97090c6d480c Mon Sep 17 00:00:00 2001 From: mikeCyb Date: Wed, 8 May 2024 12:29:37 +0300 Subject: [PATCH 03/14] favorite pack and pack score fix --- packages/app/components/ScoreContainer.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/components/ScoreContainer.tsx b/packages/app/components/ScoreContainer.tsx index b1d866c15..06c54203a 100644 --- a/packages/app/components/ScoreContainer.tsx +++ b/packages/app/components/ScoreContainer.tsx @@ -267,7 +267,6 @@ const loadStyles = (theme: any) => { fontSize: 24, }, subheader: { - display:'inline-block', textAlignVertical: 'center', } }; From 5ec0d9fb6c767eec6edf66f48055da5832136665 Mon Sep 17 00:00:00 2001 From: mikeCyb Date: Fri, 10 May 2024 09:06:28 +0300 Subject: [PATCH 04/14] Arrow fix in Create Trip page --- packages/app/components/ScoreContainer.tsx | 13 +++++-------- packages/app/components/carousel/index.tsx | 2 +- packages/app/components/feed/FeedCard.tsx | 6 +++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/app/components/ScoreContainer.tsx b/packages/app/components/ScoreContainer.tsx index 06c54203a..1f3be0a5b 100644 --- a/packages/app/components/ScoreContainer.tsx +++ b/packages/app/components/ScoreContainer.tsx @@ -203,7 +203,7 @@ export const ScoreContainer: React.FC = ({ {isAlreadyScored ? title : 'Score this pack!'} - {subheader} + {subheader} {description} {isOwner && ( @@ -236,9 +236,9 @@ const loadStyles = (theme: any) => { alignItems: 'center', }, vStack: { - justifyContent: 'space-between', - alignItems: 'center', - width: '100%', + justifyContent: 'center', + alignItems: 'flex-start', + width: Platform.OS == 'web' ? '60%' : '100%', }, scoreText: { color: currentTheme.colors.textPrimary, @@ -266,10 +266,7 @@ const loadStyles = (theme: any) => { fontWeight: '700', fontSize: 24, }, - subheader: { - textAlignVertical: 'center', - } }; }; -export default ScoreContainer; +export default ScoreContainer; \ No newline at end of file diff --git a/packages/app/components/carousel/index.tsx b/packages/app/components/carousel/index.tsx index 4c79fd617..9225414fb 100644 --- a/packages/app/components/carousel/index.tsx +++ b/packages/app/components/carousel/index.tsx @@ -30,7 +30,7 @@ const Carousel: React.FC = ({ children = [], itemWidth }) => { const scrollToIndex = (index: number) => { if (index >= 0 && index < children.length && scrollViewRef.current) { scrollViewRef.current.scrollTo({ - x: index * (itemWidth + 20), + x: index * 220, y: 0, animated: true, }); diff --git a/packages/app/components/feed/FeedCard.tsx b/packages/app/components/feed/FeedCard.tsx index 6a8f74941..3f9bf6fe7 100644 --- a/packages/app/components/feed/FeedCard.tsx +++ b/packages/app/components/feed/FeedCard.tsx @@ -281,7 +281,7 @@ export default function Card({ gap: 8, }} > - + {user?.id === owner_id ? null : ( - + )} ); -} +} \ No newline at end of file From 39762a7c3412ba2a2082e05e9ed031d0a0072df3 Mon Sep 17 00:00:00 2001 From: mikeCyb Date: Fri, 10 May 2024 13:44:29 +0300 Subject: [PATCH 05/14] Save button visiblity fix --- packages/app/components/trip/createTripModal.tsx | 1 + packages/app/screens/trip/createTrip.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/app/components/trip/createTripModal.tsx b/packages/app/components/trip/createTripModal.tsx index f747a11a0..590371a06 100644 --- a/packages/app/components/trip/createTripModal.tsx +++ b/packages/app/components/trip/createTripModal.tsx @@ -56,6 +56,7 @@ export const SaveTripContainer = ({ tripStore }: SaveTripContainerProps) => { footerButtons={[ { label: 'Save', + color: "#6F9CDE", onClick: (_, closeModal) => submitTrigger(closeModal), }, ]} diff --git a/packages/app/screens/trip/createTrip.tsx b/packages/app/screens/trip/createTrip.tsx index 71ce79f70..66ff57048 100644 --- a/packages/app/screens/trip/createTrip.tsx +++ b/packages/app/screens/trip/createTrip.tsx @@ -80,7 +80,7 @@ export default function Trips() { {!hasPhotonError && photonDetails ? ( ) : null} - {isValid && ( + {!isValid && ( From a806e8d10fb4aad0ac1a885fa2c7e8a8f5a9a844 Mon Sep 17 00:00:00 2001 From: mikeCyb Date: Fri, 10 May 2024 13:45:01 +0300 Subject: [PATCH 06/14] Save button visiblity fix --- packages/app/screens/trip/createTrip.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/screens/trip/createTrip.tsx b/packages/app/screens/trip/createTrip.tsx index 66ff57048..71ce79f70 100644 --- a/packages/app/screens/trip/createTrip.tsx +++ b/packages/app/screens/trip/createTrip.tsx @@ -80,7 +80,7 @@ export default function Trips() { {!hasPhotonError && photonDetails ? ( ) : null} - {!isValid && ( + {isValid && ( From a26202f56bab0771cf274c33a5eed313692c05e0 Mon Sep 17 00:00:00 2001 From: Andrew Bierman <94939237+andrew-bierman@users.noreply.github.com> Date: Fri, 10 May 2024 23:27:55 -0400 Subject: [PATCH 07/14] =?UTF-8?q?=F0=9F=8E=A8=20formating?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/scripts/env.ts | 8 +- apps/expo/app.config.js | 23 ++-- apps/expo/app/_layout.tsx | 2 +- .../app/components/card/CustomCardHeader.tsx | 5 +- .../card/PackCardHeader/PackCardHeader.tsx | 2 +- .../app/components/carousel/ScrollButton.tsx | 12 +- packages/app/components/feed/FeedCard.tsx | 9 +- .../app/components/itemtable/itemTable.tsx | 14 +-- .../app/components/landing_page/index.tsx | 18 +-- .../app/components/map/NativeMap.native.tsx | 4 +- packages/app/components/pack/AddPack.tsx | 8 +- packages/app/hooks/common/useCopyClipboard.ts | 12 +- packages/app/screens/about/AboutContent.tsx | 2 +- packages/app/screens/trip/steps.tsx | 2 +- packages/cli/src/doctor.js | 10 +- packages/config/src/sources/vite/index.js | 2 +- packages/crosspath/types/lib-interface.d.ts | 4 +- packages/crosspath/types/model/types.d.ts | 41 +++--- .../lib/core/src/core/content/LmAlert.tsx | 60 +++++---- .../core/src/core/content/LmAspectRatio.tsx | 4 +- .../lib/core/src/core/content/LmAvatar.tsx | 32 +++-- .../lib/core/src/core/content/LmCard.tsx | 28 ++--- .../lib/core/src/core/content/LmGrid.tsx | 6 +- .../lib/core/src/core/content/LmImage.tsx | 8 +- .../lib/core/src/core/content/LmSkeleton.tsx | 25 ++-- .../src/core/content/icons/ArrowClockwise.tsx | 23 ++-- .../content/icons/ArrowCounterClockwise.tsx | 23 ++-- .../core/src/core/content/icons/ArrowLeft.tsx | 23 ++-- .../src/core/content/icons/ArrowRight.tsx | 23 ++-- .../core/src/core/content/icons/Calendar.tsx | 18 +-- .../core/content/icons/CaretDoubleLeft.tsx | 22 ++-- .../core/content/icons/CaretDoubleRight.tsx | 22 ++-- .../core/src/core/content/icons/CaretDown.tsx | 22 ++-- .../core/src/core/content/icons/CaretLeft.tsx | 22 ++-- .../src/core/content/icons/CaretRight.tsx | 22 ++-- .../core/src/core/content/icons/CaretUp.tsx | 22 ++-- .../lib/core/src/core/content/icons/Check.tsx | 22 ++-- .../src/core/content/icons/CheckCircle.tsx | 18 +-- .../src/core/content/icons/CheckSquare.tsx | 22 ++-- .../lib/core/src/core/content/icons/Eye.tsx | 23 ++-- .../core/src/core/content/icons/EyeSlash.tsx | 119 +++++++++--------- .../core/src/core/content/icons/IconProps.tsx | 16 +-- .../lib/core/src/core/content/icons/Info.tsx | 18 +-- .../lib/core/src/core/content/icons/List.tsx | 18 +-- .../src/core/content/icons/ListNumbers.tsx | 18 +-- .../core/src/core/content/icons/ListPlus.tsx | 18 +-- .../lib/core/src/core/content/icons/Minus.tsx | 18 +-- .../core/src/core/content/icons/Quotes.tsx | 18 +-- .../core/src/core/content/icons/Square.tsx | 18 +-- .../lib/core/src/core/content/icons/Star.tsx | 18 +-- .../core/src/core/content/icons/StarFill.tsx | 26 ++-- .../lib/core/src/core/content/icons/Sun.tsx | 23 ++-- .../src/core/content/icons/TextBolder.tsx | 18 +-- .../src/core/content/icons/TextItalic.tsx | 18 +-- .../core/content/icons/TextStrikethrough.tsx | 23 ++-- .../src/core/content/icons/TextUnderline.tsx | 23 ++-- .../core/src/core/content/icons/Warning.tsx | 18 +-- .../src/core/content/icons/WarningCircle.tsx | 23 ++-- .../lib/core/src/core/content/icons/X.tsx | 18 +-- .../lib/core/src/core/content/icons/index.tsx | 68 +++++----- .../core/src/core/content/icons/themed.tsx | 26 ++-- .../extras/lib/core/src/core/content/index.ts | 12 +- .../lib/core/src/core/form/LmButton.tsx | 20 +-- .../extras/lib/core/src/core/form/index.ts | 2 +- .../extras/lib/core/src/core/hooks/index.ts | 2 +- .../core/src/core/hooks/usePopoverState.ts | 16 +-- .../core/src/core/panels/LmAlertDialog.tsx | 40 +++--- .../lib/core/src/core/panels/LmDialog.tsx | 48 +++---- .../core/src/core/panels/LmDialogActions.tsx | 16 ++- .../core/src/core/panels/LmDialogContent.tsx | 8 +- .../lib/core/src/core/panels/LmPopover.tsx | 33 +++-- .../lib/core/src/core/panels/LmSheet.tsx | 26 ++-- .../extras/lib/core/src/core/panels/index.ts | 8 +- .../src/core/panels/useFloatingContext.tsx | 30 +++-- .../extras/lib/core/src/core/themeMappings.ts | 12 +- packages/ui/src/extras/lib/core/src/index.ts | 12 +- packages/ui/src/form/lib/LmInput.tsx | 6 +- packages/ui/src/form/lib/LmStarRating.tsx | 4 +- server/.eslintrc.js | 2 +- server/src/db/client.ts | 2 +- server/src/index.ts | 2 +- server/src/tests/routes/favorite.test.ts | 3 +- server/src/tests/routes/pack.test.ts | 4 +- server/src/tests/routes/trip.test.ts | 2 +- server/src/tests/routes/weather.test.ts | 2 +- server/vitest.config.d.ts | 4 +- 86 files changed, 859 insertions(+), 688 deletions(-) diff --git a/.github/scripts/env.ts b/.github/scripts/env.ts index 61e17fb4b..6a938cd25 100644 --- a/.github/scripts/env.ts +++ b/.github/scripts/env.ts @@ -109,8 +109,10 @@ const tauriFileContent = envFileContent } }) .join('\n'); -fs.writeFileSync(tauriOutputPath, `${autogeneratedComment}\n${tauriFileContent}`); - +fs.writeFileSync( + tauriOutputPath, + `${autogeneratedComment}\n${tauriFileContent}`, +); // TODO: Add wrangler env generation /** @@ -131,4 +133,4 @@ fs.writeFileSync(tauriOutputPath, `${autogeneratedComment}\n${tauriFileContent}` // fs.writeFileSync( // wranglerOutputPath, // `${autogeneratedComment}\n${wranglerFileContent}\n${noD1Warning}` -// ) \ No newline at end of file +// ) diff --git a/apps/expo/app.config.js b/apps/expo/app.config.js index 20b11ea8e..cb7e75895 100644 --- a/apps/expo/app.config.js +++ b/apps/expo/app.config.js @@ -1,8 +1,6 @@ -import "dotenv/config"; - +import 'dotenv/config'; module.exports = ({ config }) => { - config.extra.NODE_ENV = process.env.NODE_ENV; config.extra.CLIENT_URL = process.env.CLIENT_URL; config.extra.MAPBOX_ACCESS_TOKEN = process.env.MAPBOX_ACCESS_TOKEN; @@ -10,22 +8,23 @@ module.exports = ({ config }) => { config.extra.EXPO_PUBLIC_NODE_ENV = process.env.EXPO_PUBLIC_NODE_ENV; config.extra.EXPO_PUBLIC_CLIENT_URL = process.env.EXPO_PUBLIC_CLIENT_URL; - config.extra.EXPO_PUBLIC_MAPBOX_ACCESS_TOKEN = process.env.EXPO_PUBLIC_MAPBOX_ACCESS_TOKEN; + config.extra.EXPO_PUBLIC_MAPBOX_ACCESS_TOKEN = + process.env.EXPO_PUBLIC_MAPBOX_ACCESS_TOKEN; config.extra.EXPO_PUBLIC_API_URL = process.env.EXPO_PUBLIC_API_URL; return { ...config, - plugins: config.plugins.map(i => { - if (i[0] === "@rnmapbox/maps") { + plugins: config.plugins.map((i) => { + if (i[0] === '@rnmapbox/maps') { return [ - "@rnmapbox/maps", + '@rnmapbox/maps', { - "RNMapboxMapsImpl": "mapbox", - "RNMapboxMapsDownloadToken": process.env.MAPBOX_DOWNLOADS_TOKEN - } - ] + RNMapboxMapsImpl: 'mapbox', + RNMapboxMapsDownloadToken: process.env.MAPBOX_DOWNLOADS_TOKEN, + }, + ]; } return i; - }) + }), }; }; diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx index aeaffa7ac..15d3b3b82 100644 --- a/apps/expo/app/_layout.tsx +++ b/apps/expo/app/_layout.tsx @@ -11,4 +11,4 @@ export default function HomeLayout() { /> ); -} \ No newline at end of file +} diff --git a/packages/app/components/card/CustomCardHeader.tsx b/packages/app/components/card/CustomCardHeader.tsx index 479b08427..82c5f4801 100644 --- a/packages/app/components/card/CustomCardHeader.tsx +++ b/packages/app/components/card/CustomCardHeader.tsx @@ -15,10 +15,7 @@ export const CustomCardHeader = ({ data, title, link, actionsComponent }) => { return ( <> - {typeof title === "string" ? - {title} - : title - } + {typeof title === 'string' ? {title} : title} diff --git a/packages/app/components/card/PackCardHeader/PackCardHeader.tsx b/packages/app/components/card/PackCardHeader/PackCardHeader.tsx index ebafad67d..168b58c6c 100644 --- a/packages/app/components/card/PackCardHeader/PackCardHeader.tsx +++ b/packages/app/components/card/PackCardHeader/PackCardHeader.tsx @@ -48,7 +48,7 @@ export const PackCardHeader = ({ data, title, link }: PackCardHeaderProps) => { title={ { style={styles.scrollButton} disabled={disabled} > - {direction === 'left' && ⟨} - {direction != 'left' && ⟩} + {direction === 'left' && ( + + ⟨ + + )} + {direction != 'left' && ( + + ⟩ + + )} ); }; diff --git a/packages/app/components/feed/FeedCard.tsx b/packages/app/components/feed/FeedCard.tsx index 2e802a904..368eaba65 100644 --- a/packages/app/components/feed/FeedCard.tsx +++ b/packages/app/components/feed/FeedCard.tsx @@ -103,10 +103,11 @@ export default function Card({ const truncatedDestination = truncateString(destination, 25); const formattedWeight = convertWeight(total_weight, 'g', weightUnit); // const formattedWeight = formatNumber(total_weight); // TODO convert to user preference once implemented - const quantity = itemPacks?.reduce( - (accumulator, currentValue) => accumulator + currentValue?.item?.quantity, - 0, - ) ?? 0; + const quantity = + itemPacks?.reduce( + (accumulator, currentValue) => accumulator + currentValue?.item?.quantity, + 0, + ) ?? 0; let numberOfNights; if (duration) numberOfNights = JSON.parse(duration).numberOfNights; diff --git a/packages/app/components/itemtable/itemTable.tsx b/packages/app/components/itemtable/itemTable.tsx index ceb30136b..4c59ff20d 100644 --- a/packages/app/components/itemtable/itemTable.tsx +++ b/packages/app/components/itemtable/itemTable.tsx @@ -148,7 +148,7 @@ export const ItemsTable = ({ * @return {undefined} This function doesn't return anything. */ const handleNextPage = () => { - setPage(page + 1) + setPage(page + 1); }; /** * Handles the action of going to the previous page. @@ -236,11 +236,7 @@ export const ItemsTable = ({ disabled={page < 2} onPress={handlePreviousPage} > - + - + diff --git a/packages/app/components/landing_page/index.tsx b/packages/app/components/landing_page/index.tsx index a4e3b2fd2..a78511952 100644 --- a/packages/app/components/landing_page/index.tsx +++ b/packages/app/components/landing_page/index.tsx @@ -140,15 +140,15 @@ const LandingPage = () => { - - { - /* Add navigation to the sign in screen */ - }} - > - Get Started - + + { + /* Add navigation to the sign in screen */ + }} + > + Get Started + diff --git a/packages/app/components/map/NativeMap.native.tsx b/packages/app/components/map/NativeMap.native.tsx index aca7ad9b0..322a11cb6 100644 --- a/packages/app/components/map/NativeMap.native.tsx +++ b/packages/app/components/map/NativeMap.native.tsx @@ -118,8 +118,8 @@ function NativeMap({ shape: shapeProp }) { isPoint(shape) ? pointLatLong : isPolygonOrMultiPolygon(shape) - ? multiPolygonBounds(shape.features[0]) - : trailCenterPoint + ? multiPolygonBounds(shape.features[0]) + : trailCenterPoint } animationMode={'flyTo'} animationDuration={2000} diff --git a/packages/app/components/pack/AddPack.tsx b/packages/app/components/pack/AddPack.tsx index a8b69f703..dd0e06c6d 100644 --- a/packages/app/components/pack/AddPack.tsx +++ b/packages/app/components/pack/AddPack.tsx @@ -39,8 +39,7 @@ export const AddPack = ({ isCreatingTrip = false, onSuccess }) => { */ const handleAddPack = async (data) => { try { - - const response = await addNewPackAsync(data); + const response = await addNewPackAsync(data); onSuccess?.(); @@ -51,9 +50,8 @@ export const AddPack = ({ isCreatingTrip = false, onSuccess }) => { router.push(`/pack/${response.id}`); return; } - - setPackIdParam(response.id); + setPackIdParam(response.id); } catch {} }; @@ -85,7 +83,7 @@ export const AddPack = ({ isCreatingTrip = false, onSuccess }) => { placeholder={'Is Public'} /> diff --git a/packages/app/hooks/common/useCopyClipboard.ts b/packages/app/hooks/common/useCopyClipboard.ts index b21edb361..e1790a08d 100644 --- a/packages/app/hooks/common/useCopyClipboard.ts +++ b/packages/app/hooks/common/useCopyClipboard.ts @@ -18,11 +18,13 @@ export const useCopyClipboard = (link: string) => { console.error('Failed to copy text to clipboard', err); }); } else { - Clipboard.setStringAsync(copyLink).then(() => { - console.log('Text copied to clipboard'); - }).catch((err) => { - console.error('Failed to copy text to clipboard', err); - }); + Clipboard.setStringAsync(copyLink) + .then(() => { + console.log('Text copied to clipboard'); + }) + .catch((err) => { + console.error('Failed to copy text to clipboard', err); + }); } setIsCopied(true); diff --git a/packages/app/screens/about/AboutContent.tsx b/packages/app/screens/about/AboutContent.tsx index 6fe73a80d..04a5f8a38 100644 --- a/packages/app/screens/about/AboutContent.tsx +++ b/packages/app/screens/about/AboutContent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { View, Text , ScrollView} from 'react-native'; +import { View, Text, ScrollView } from 'react-native'; import { FontAwesome, MaterialCommunityIcons } from '@expo/vector-icons'; import { RButton, RStack } from '@packrat/ui'; import useTheme from '../../hooks/useTheme'; diff --git a/packages/app/screens/trip/steps.tsx b/packages/app/screens/trip/steps.tsx index 0a5b12129..ae836651b 100644 --- a/packages/app/screens/trip/steps.tsx +++ b/packages/app/screens/trip/steps.tsx @@ -4,7 +4,7 @@ import { TripCard } from 'app/components/trip/TripCard'; import WeatherCard from 'app/components/weather/WeatherCard'; import { GearList } from 'app/components/GearList/GearList'; import { SaveTripContainer } from 'app/components/trip/createTripModal'; -import TripDateRange from 'app/components/trip/TripDateRange'; +import TripDateRange from 'app/components/trip/TripDateRange'; import useTheme from 'app/hooks/useTheme'; import useCustomStyles from 'app/hooks/useCustomStyles'; import { useFetchWeather, useFetchWeatherWeak } from 'app/hooks/weather'; diff --git a/packages/cli/src/doctor.js b/packages/cli/src/doctor.js index 178e94cc4..eda293aba 100644 --- a/packages/cli/src/doctor.js +++ b/packages/cli/src/doctor.js @@ -41,16 +41,16 @@ async function runDiagnostics() { name: 'appName', message: 'Select an app to diagnose:', choices: ['bun-server', 'expo', 'next', 'tauri', 'vite'], - } + }, ]); const configFileNames = { - 'expo': ['app.json'], - 'next': ['next.config.js'], - 'vite': ['vite.config.js'], + expo: ['app.json'], + next: ['next.config.js'], + vite: ['vite.config.js'], // Assuming generic checks for Bun and Tauri, adjust based on real config files 'bun-server': ['package.json'], - 'tauri': ['package.json'], + tauri: ['package.json'], }; await checkConfigFiles(response.appName, configFileNames[response.appName]); diff --git a/packages/config/src/sources/vite/index.js b/packages/config/src/sources/vite/index.js index 393be8135..94c097945 100644 --- a/packages/config/src/sources/vite/index.js +++ b/packages/config/src/sources/vite/index.js @@ -1 +1 @@ -export * from './viteSource'; \ No newline at end of file +export * from './viteSource'; diff --git a/packages/crosspath/types/lib-interface.d.ts b/packages/crosspath/types/lib-interface.d.ts index 524b24431..acf8c94d3 100644 --- a/packages/crosspath/types/lib-interface.d.ts +++ b/packages/crosspath/types/lib-interface.d.ts @@ -1,4 +1,6 @@ import { LinkComponent, Router, CreateParam } from './model'; -export declare function Link(props: Parameters): ReturnType; +export declare function Link( + props: Parameters, +): ReturnType; export declare const createParam: CreateParam; export declare function useRouter(): Router; diff --git a/packages/crosspath/types/model/types.d.ts b/packages/crosspath/types/model/types.d.ts index 9c3ee437d..5e7b7414e 100644 --- a/packages/crosspath/types/model/types.d.ts +++ b/packages/crosspath/types/model/types.d.ts @@ -1,27 +1,32 @@ import { FC } from 'react'; import { LinkProps } from 'solito/link'; export interface CreateParamOptions { - initial?: string; - parse?: (param: string) => unknown; - stringify?: (param: unknown) => string; + initial?: string; + parse?: (param: string) => unknown; + stringify?: (param: unknown) => string; } export interface Router { - push: (url: URL) => void; - replace: (url: URL) => void; - back: () => void; + push: (url: URL) => void; + replace: (url: URL) => void; + back: () => void; } export type LinkComponent = FC; -export type URL = string | { - pathname?: string; - query?: Record; - state?: Record; - hash?: string; - as?: string | object; -}; -export type CreateParam = () => { - useParam: (key: keyof T, options?: CreateParamOptions) => [value: any, setValue: (value: any) => void]; - useParams: (key: keyof T) => { - params: T; - setParams: (value: any) => void; +export type URL = + | string + | { + pathname?: string; + query?: Record; + state?: Record; + hash?: string; + as?: string | object; }; +export type CreateParam = () => { + useParam: ( + key: keyof T, + options?: CreateParamOptions, + ) => [value: any, setValue: (value: any) => void]; + useParams: (key: keyof T) => { + params: T; + setParams: (value: any) => void; + }; }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/LmAlert.tsx b/packages/ui/src/extras/lib/core/src/core/content/LmAlert.tsx index d1fcd80e5..31c80d8ea 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/LmAlert.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/LmAlert.tsx @@ -8,25 +8,25 @@ import { useThemeName, XStack, XStackProps, -} from 'tamagui' +} from 'tamagui'; import { CheckCircleRegular, IconProps, InfoRegular, WarningCircleRegular, WarningRegular, -} from './icons' +} from './icons'; -type Severity = 'default' | 'error' | 'info' | 'warning' | 'success' +type Severity = 'default' | 'error' | 'info' | 'warning' | 'success'; export type LmAlertProps = CardProps & { - severity?: Severity - text?: string - outlined?: boolean - hideIcon?: boolean - paragraphProps?: ParagraphProps - xStackProps?: XStackProps - iconProps?: IconProps -} + severity?: Severity; + text?: string; + outlined?: boolean; + hideIcon?: boolean; + paragraphProps?: ParagraphProps; + xStackProps?: XStackProps; + iconProps?: IconProps; +}; const severityColor: { [k in Severity]: ColorProp } = { default: '$gray3', @@ -34,20 +34,24 @@ const severityColor: { [k in Severity]: ColorProp } = { info: '$blue10', warning: '$orange10', success: '$green10', -} +}; type AlertIconProps = { - severity?: Severity - outlined?: boolean - shouldInvert?: boolean -} + severity?: Severity; + outlined?: boolean; + shouldInvert?: boolean; +}; -function AlertIcon({ severity = 'default', outlined, shouldInvert }: AlertIconProps) { - const props: { color?: ColorTokens } = {} +function AlertIcon({ + severity = 'default', + outlined, + shouldInvert, +}: AlertIconProps) { + const props: { color?: ColorTokens } = {}; if (outlined) { - props.color = severityColor[severity] as ColorTokens + props.color = severityColor[severity] as ColorTokens; } else if (shouldInvert) { - props.color = 'white' + props.color = 'white'; } return { default: , @@ -55,7 +59,7 @@ function AlertIcon({ severity = 'default', outlined, shouldInvert }: AlertIconPr info: , warning: , success: , - }[severity] + }[severity]; } export function LmAlert({ @@ -69,8 +73,8 @@ export function LmAlert({ iconProps, ...rest }: LmAlertProps) { - const theme = useThemeName() - let shouldInverse = theme === 'light' && severity !== 'default' && !outlined + const theme = useThemeName(); + let shouldInverse = theme === 'light' && severity !== 'default' && !outlined; return ( {text && ( {text} @@ -103,5 +113,5 @@ export function LmAlert({ {children} - ) + ); } diff --git a/packages/ui/src/extras/lib/core/src/core/content/LmAspectRatio.tsx b/packages/ui/src/extras/lib/core/src/core/content/LmAspectRatio.tsx index b5830c763..77d9c40c1 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/LmAspectRatio.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/LmAspectRatio.tsx @@ -1,3 +1,3 @@ -import {styled, ThemeableStack} from "tamagui"; +import { styled, ThemeableStack } from 'tamagui'; -export const LmAspectRatio = styled(ThemeableStack, {}) \ No newline at end of file +export const LmAspectRatio = styled(ThemeableStack, {}); diff --git a/packages/ui/src/extras/lib/core/src/core/content/LmAvatar.tsx b/packages/ui/src/extras/lib/core/src/core/content/LmAvatar.tsx index de063ed67..8d2b1aeab 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/LmAvatar.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/LmAvatar.tsx @@ -1,14 +1,28 @@ -import { Avatar, AvatarProps, FontSizeTokens, ImageProps, Paragraph, ParagraphProps } from 'tamagui' +import { + Avatar, + AvatarProps, + FontSizeTokens, + ImageProps, + Paragraph, + ParagraphProps, +} from 'tamagui'; export type LmAvatarProps = AvatarProps & { - color?: AvatarProps['backgroundColor'] - src?: string - letter?: string - letterProps?: ParagraphProps - imageProps?: ImageProps -} + color?: AvatarProps['backgroundColor']; + src?: string; + letter?: string; + letterProps?: ParagraphProps; + imageProps?: ImageProps; +}; -export function LmAvatar({ color, src, letter, letterProps, imageProps, ...rest }: LmAvatarProps) { +export function LmAvatar({ + color, + src, + letter, + letterProps, + imageProps, + ...rest +}: LmAvatarProps) { return ( )} - ) + ); } diff --git a/packages/ui/src/extras/lib/core/src/core/content/LmCard.tsx b/packages/ui/src/extras/lib/core/src/core/content/LmCard.tsx index ce7f87ca0..726b449fd 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/LmCard.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/LmCard.tsx @@ -1,20 +1,20 @@ -import { Card, CardProps, H2, Paragraph, ThemeName } from 'tamagui' -import { PropsWithChildren, ReactNode } from 'react' -import { LmImage } from './LmImage' +import { Card, CardProps, H2, Paragraph, ThemeName } from 'tamagui'; +import { PropsWithChildren, ReactNode } from 'react'; +import { LmImage } from './LmImage'; export type LmCardProps = PropsWithChildren< CardProps & { - bouncy?: boolean - title?: string - subTitle?: string - footer?: ReactNode + bouncy?: boolean; + title?: string; + subTitle?: string; + footer?: ReactNode; image?: { - width: number - height: number - src: string - } + width: number; + height: number; + src: string; + }; } -> +>; export const LmCard = ({ bouncy, @@ -65,5 +65,5 @@ export const LmCard = ({ )} - ) -} + ); +}; diff --git a/packages/ui/src/extras/lib/core/src/core/content/LmGrid.tsx b/packages/ui/src/extras/lib/core/src/core/content/LmGrid.tsx index 69a3cc235..8fa1bb445 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/LmGrid.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/LmGrid.tsx @@ -1,4 +1,4 @@ -import { styled, ThemeableStack } from 'tamagui' +import { styled, ThemeableStack } from 'tamagui'; export const LmGrid = styled(ThemeableStack, { variants: { @@ -60,7 +60,7 @@ export const LmGrid = styled(ThemeableStack, { return { alignItems: 'center', justifyContent: 'center', - } + }; } }, }, @@ -143,4 +143,4 @@ export const LmGrid = styled(ThemeableStack, { }), }, } as const, -}) +}); diff --git a/packages/ui/src/extras/lib/core/src/core/content/LmImage.tsx b/packages/ui/src/extras/lib/core/src/core/content/LmImage.tsx index 45a9cb17c..a36fd92c3 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/LmImage.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/LmImage.tsx @@ -1,6 +1,6 @@ -import { Image, ImageProps, Stack } from 'tamagui' +import { Image, ImageProps, Stack } from 'tamagui'; -export type LmImageProps = ImageProps +export type LmImageProps = ImageProps; export function LmImage({ aspectRatio, ...props }: LmImageProps) { if (aspectRatio) { @@ -14,7 +14,7 @@ export function LmImage({ aspectRatio, ...props }: LmImageProps) { resizeMode={'contain'} /> - ) + ); } - return + return ; } diff --git a/packages/ui/src/extras/lib/core/src/core/content/LmSkeleton.tsx b/packages/ui/src/extras/lib/core/src/core/content/LmSkeleton.tsx index 4f8135124..8b5285e2b 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/LmSkeleton.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/LmSkeleton.tsx @@ -1,10 +1,19 @@ -import {Spinner, Stack} from "tamagui"; +import { Spinner, Stack } from 'tamagui'; export function LmSkeleton() { - return ( - - - - ) -} \ No newline at end of file + return ( + + + + ); +} diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowClockwise.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowClockwise.tsx index 621c05350..c8f11b053 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowClockwise.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowClockwise.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Path as _Path, Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Path as _Path, + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -24,8 +29,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'ArrowClockwiseRegular' -const ArrowClockwiseRegular = memo(themed(Icon)) -export { ArrowClockwiseRegular } + ); +}; +Icon.displayName = 'ArrowClockwiseRegular'; +const ArrowClockwiseRegular = memo(themed(Icon)); +export { ArrowClockwiseRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowCounterClockwise.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowCounterClockwise.tsx index 0c20d47f8..0c4a31dcf 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowCounterClockwise.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowCounterClockwise.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Path as _Path, Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Path as _Path, + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -24,8 +29,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'ArrowCounterClockwiseRegular' -const ArrowCounterClockwiseRegular = memo(themed(Icon)) -export { ArrowCounterClockwiseRegular } + ); +}; +Icon.displayName = 'ArrowCounterClockwiseRegular'; +const ArrowCounterClockwiseRegular = memo(themed(Icon)); +export { ArrowCounterClockwiseRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowLeft.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowLeft.tsx index f4a5b209e..99fba788e 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowLeft.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowLeft.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Line as _Line, Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Line as _Line, + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -27,8 +32,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'ArrowLeftRegular' -const ArrowLeftRegular = memo(themed(Icon)) -export { ArrowLeftRegular } + ); +}; +Icon.displayName = 'ArrowLeftRegular'; +const ArrowLeftRegular = memo(themed(Icon)); +export { ArrowLeftRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowRight.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowRight.tsx index b4c76b6b6..f0fdfc56d 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowRight.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/ArrowRight.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Line as _Line, Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Line as _Line, + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -27,8 +32,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'ArrowRightRegular' -const ArrowRightRegular = memo(themed(Icon)) -export { ArrowRightRegular } + ); +}; +Icon.displayName = 'ArrowRightRegular'; +const ArrowRightRegular = memo(themed(Icon)); +export { ArrowRightRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Calendar.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Calendar.tsx index cc543c76a..8b0eb0224 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Calendar.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Calendar.tsx @@ -1,15 +1,15 @@ -import { memo } from 'react' +import { memo } from 'react'; import { Line as _Line, Path as _Path, Polyline as _Polyline, Rect as _Rect, Svg as _Svg, -} from 'react-native-svg' -import { themed } from './themed' +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -75,8 +75,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CalendarRegular' -const CalendarRegular = memo(themed(Icon)) -export { CalendarRegular } + ); +}; +Icon.displayName = 'CalendarRegular'; +const CalendarRegular = memo(themed(Icon)); +export { CalendarRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleLeft.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleLeft.tsx index fa1722299..c070593b7 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleLeft.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleLeft.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -24,8 +28,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CaretDoubleLeftRegular' -const CaretDoubleLeftRegular = memo(themed(Icon)) -export { CaretDoubleLeftRegular } + ); +}; +Icon.displayName = 'CaretDoubleLeftRegular'; +const CaretDoubleLeftRegular = memo(themed(Icon)); +export { CaretDoubleLeftRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleRight.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleRight.tsx index 43b8fa270..a96e1aac2 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleRight.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDoubleRight.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -24,8 +28,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CaretDoubleRightRegular' -const CaretDoubleRightRegular = memo(themed(Icon)) -export { CaretDoubleRightRegular } + ); +}; +Icon.displayName = 'CaretDoubleRightRegular'; +const CaretDoubleRightRegular = memo(themed(Icon)); +export { CaretDoubleRightRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDown.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDown.tsx index d6267c6bf..d21b170c8 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDown.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretDown.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -16,8 +20,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CaretDownRegular' -const CaretDownRegular = memo(themed(Icon)) -export { CaretDownRegular } + ); +}; +Icon.displayName = 'CaretDownRegular'; +const CaretDownRegular = memo(themed(Icon)); +export { CaretDownRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretLeft.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretLeft.tsx index 24d68acc0..41294b684 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretLeft.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretLeft.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -16,8 +20,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CaretLeftRegular' -const CaretLeftRegular = memo(themed(Icon)) -export { CaretLeftRegular } + ); +}; +Icon.displayName = 'CaretLeftRegular'; +const CaretLeftRegular = memo(themed(Icon)); +export { CaretLeftRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretRight.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretRight.tsx index 5633ef7cb..ed185b202 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretRight.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretRight.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -16,8 +20,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CaretRightRegular' -const CaretRightRegular = memo(themed(Icon)) -export { CaretRightRegular } + ); +}; +Icon.displayName = 'CaretRightRegular'; +const CaretRightRegular = memo(themed(Icon)); +export { CaretRightRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretUp.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretUp.tsx index 428b0c766..7628d8526 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CaretUp.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CaretUp.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -16,8 +20,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CaretUpRegular' -const CaretUpRegular = memo(themed(Icon)) -export { CaretUpRegular } + ); +}; +Icon.displayName = 'CaretUpRegular'; +const CaretUpRegular = memo(themed(Icon)); +export { CaretUpRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Check.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Check.tsx index b345875c7..048618d9d 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Check.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Check.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -16,8 +20,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CheckRegular' -const CheckRegular = memo(themed(Icon)) -export { CheckRegular } + ); +}; +Icon.displayName = 'CheckRegular'; +const CheckRegular = memo(themed(Icon)); +export { CheckRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CheckCircle.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CheckCircle.tsx index d63acd920..d394fdb2a 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CheckCircle.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CheckCircle.tsx @@ -1,14 +1,14 @@ -import { memo } from 'react' +import { memo } from 'react'; import { Circle as _Circle, Polyline as _Polyline, Rect as _Rect, Svg as _Svg, -} from 'react-native-svg' -import { themed } from './themed' +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -31,8 +31,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CheckCircleRegular' -const CheckCircleRegular = memo(themed(Icon)) -export { CheckCircleRegular } + ); +}; +Icon.displayName = 'CheckCircleRegular'; +const CheckCircleRegular = memo(themed(Icon)); +export { CheckCircleRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/CheckSquare.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/CheckSquare.tsx index c166c7605..a6a56e78a 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/CheckSquare.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/CheckSquare.tsx @@ -1,9 +1,13 @@ -import { memo } from 'react' -import { Polyline as _Polyline, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Polyline as _Polyline, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -28,8 +32,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'CheckSquareRegular' -const CheckSquareRegular = memo(themed(Icon)) -export { CheckSquareRegular } + ); +}; +Icon.displayName = 'CheckSquareRegular'; +const CheckSquareRegular = memo(themed(Icon)); +export { CheckSquareRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Eye.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Eye.tsx index c80016b5c..e225ad21d 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Eye.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Eye.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Circle as _Circle, Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Circle as _Circle, + Path as _Path, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -26,8 +31,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'EyeRegular' -const EyeRegular = memo(themed(Icon)) -export { EyeRegular } + ); +}; +Icon.displayName = 'EyeRegular'; +const EyeRegular = memo(themed(Icon)); +export { EyeRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/EyeSlash.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/EyeSlash.tsx index 115d1efb2..9671ff2dc 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/EyeSlash.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/EyeSlash.tsx @@ -1,58 +1,63 @@ -import { memo } from 'react' - import { Line as _Line, Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' - import { themed } from './themed' +import { memo } from 'react'; +import { + Line as _Line, + Path as _Path, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; - const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props - return ( - <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> - <_Rect width="256" height="256" fill="none" /> - <_Line - x1="48" - y1="40" - x2="208" - y2="216" - fill="none" - stroke={`${color}`} - strokeLinecap="round" - strokeLinejoin="round" - strokeWidth="16" - /> - <_Path - d="M154.9,157.6A39.6,39.6,0,0,1,128,168a40,40,0,0,1-26.9-69.6" - fill="none" - stroke={`${color}`} - strokeLinecap="round" - strokeLinejoin="round" - strokeWidth="16" - /> - <_Path - d="M74,68.6C33.2,89.2,16,128,16,128s32,72,112,72a117.9,117.9,0,0,0,54-12.6" - fill="none" - stroke={`${color}`} - strokeLinecap="round" - strokeLinejoin="round" - strokeWidth="16" - /> - <_Path - d="M208.6,169.1C230.4,149.6,240,128,240,128S208,56,128,56a123.9,123.9,0,0,0-20.7,1.7" - fill="none" - stroke={`${color}`} - strokeLinecap="round" - strokeLinejoin="round" - strokeWidth="16" - /> - <_Path - d="M135.5,88.7a39.9,39.9,0,0,1,32.3,35.5" - fill="none" - stroke={`${color}`} - strokeLinecap="round" - strokeLinejoin="round" - strokeWidth="16" - /> - - ) - } - Icon.displayName = 'EyeSlashRegular' - const EyeSlashRegular = memo(themed(Icon)) - export { EyeSlashRegular } \ No newline at end of file +const Icon = (props) => { + const { color = 'black', size = 24, ...otherProps } = props; + return ( + <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> + <_Rect width="256" height="256" fill="none" /> + <_Line + x1="48" + y1="40" + x2="208" + y2="216" + fill="none" + stroke={`${color}`} + strokeLinecap="round" + strokeLinejoin="round" + strokeWidth="16" + /> + <_Path + d="M154.9,157.6A39.6,39.6,0,0,1,128,168a40,40,0,0,1-26.9-69.6" + fill="none" + stroke={`${color}`} + strokeLinecap="round" + strokeLinejoin="round" + strokeWidth="16" + /> + <_Path + d="M74,68.6C33.2,89.2,16,128,16,128s32,72,112,72a117.9,117.9,0,0,0,54-12.6" + fill="none" + stroke={`${color}`} + strokeLinecap="round" + strokeLinejoin="round" + strokeWidth="16" + /> + <_Path + d="M208.6,169.1C230.4,149.6,240,128,240,128S208,56,128,56a123.9,123.9,0,0,0-20.7,1.7" + fill="none" + stroke={`${color}`} + strokeLinecap="round" + strokeLinejoin="round" + strokeWidth="16" + /> + <_Path + d="M135.5,88.7a39.9,39.9,0,0,1,32.3,35.5" + fill="none" + stroke={`${color}`} + strokeLinecap="round" + strokeLinejoin="round" + strokeWidth="16" + /> + + ); +}; +Icon.displayName = 'EyeSlashRegular'; +const EyeSlashRegular = memo(themed(Icon)); +export { EyeSlashRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/IconProps.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/IconProps.tsx index 377a4eab1..892dd98c4 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/IconProps.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/IconProps.tsx @@ -1,11 +1,11 @@ -import { ColorTokens, SizeTokens, ThemeTokens } from '@tamagui/core' -import { SvgProps } from 'react-native-svg' +import { ColorTokens, SizeTokens, ThemeTokens } from '@tamagui/core'; +import { SvgProps } from 'react-native-svg'; export type IconContextProps = { - size?: number | SizeTokens - color?: (ColorTokens | ThemeTokens) | null - style?: any - weight?: 'thin' | 'light' | 'regular' | 'bold' | 'fill' | 'duotone' -} + size?: number | SizeTokens; + color?: (ColorTokens | ThemeTokens) | null; + style?: any; + weight?: 'thin' | 'light' | 'regular' | 'bold' | 'fill' | 'duotone'; +}; -export type IconProps = SvgProps & IconContextProps +export type IconProps = SvgProps & IconContextProps; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Info.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Info.tsx index 0e4d3fbe8..e99b75314 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Info.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Info.tsx @@ -1,14 +1,14 @@ -import { memo } from 'react' +import { memo } from 'react'; import { Circle as _Circle, Polyline as _Polyline, Rect as _Rect, Svg as _Svg, -} from 'react-native-svg' -import { themed } from './themed' +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -32,8 +32,8 @@ const Icon = (props) => { /> <_Circle cx="126" cy="84" r="12" fill={`${color}`} /> - ) -} -Icon.displayName = 'InfoRegular' -const InfoRegular = memo(themed(Icon)) -export { InfoRegular } + ); +}; +Icon.displayName = 'InfoRegular'; +const InfoRegular = memo(themed(Icon)); +export { InfoRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/List.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/List.tsx index b6cf425a0..cc9999054 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/List.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/List.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -38,8 +38,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'ListRegular' -const ListRegular = memo(themed(Icon)) -export { ListRegular } + ); +}; +Icon.displayName = 'ListRegular'; +const ListRegular = memo(themed(Icon)); +export { ListRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/ListNumbers.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/ListNumbers.tsx index 13474c63c..646f9c660 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/ListNumbers.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/ListNumbers.tsx @@ -1,15 +1,15 @@ -import { memo } from 'react' +import { memo } from 'react'; import { Line as _Line, Path as _Path, Polyline as _Polyline, Rect as _Rect, Svg as _Svg, -} from 'react-native-svg' -import { themed } from './themed' +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -60,8 +60,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'ListNumbersRegular' -const ListNumbersRegular = memo(themed(Icon)) -export { ListNumbersRegular } + ); +}; +Icon.displayName = 'ListNumbersRegular'; +const ListNumbersRegular = memo(themed(Icon)); +export { ListNumbersRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/ListPlus.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/ListPlus.tsx index deff3d0ab..fec5d542d 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/ListPlus.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/ListPlus.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -63,8 +63,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'ListPlusRegular' -const ListPlusRegular = memo(themed(Icon)) -export { ListPlusRegular } + ); +}; +Icon.displayName = 'ListPlusRegular'; +const ListPlusRegular = memo(themed(Icon)); +export { ListPlusRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Minus.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Minus.tsx index 51c580594..00a69979d 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Minus.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Minus.tsx @@ -1,11 +1,11 @@ -import React, { memo } from 'react' -import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg' +import React, { memo } from 'react'; +import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; -import { themed } from './themed' -import { IconProps } from './IconProps' +import { themed } from './themed'; +import { IconProps } from './IconProps'; const Icon = (props: IconProps) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -21,9 +21,9 @@ const Icon = (props: IconProps) => { strokeWidth="16" /> - ) -} + ); +}; -Icon.displayName = 'MinusRegular' +Icon.displayName = 'MinusRegular'; -export const MinusRegular = memo(themed(Icon)) +export const MinusRegular = memo(themed(Icon)); diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Quotes.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Quotes.tsx index b6e2258ea..443247106 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Quotes.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Quotes.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -24,8 +24,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'QuotesRegular' -const QuotesRegular = memo(themed(Icon)) -export { QuotesRegular } + ); +}; +Icon.displayName = 'QuotesRegular'; +const QuotesRegular = memo(themed(Icon)); +export { QuotesRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Square.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Square.tsx index 5ffee2bbe..fcfd9bd84 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Square.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Square.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -20,8 +20,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'SquareRegular' -const SquareRegular = memo(themed(Icon)) -export { SquareRegular } + ); +}; +Icon.displayName = 'SquareRegular'; +const SquareRegular = memo(themed(Icon)); +export { SquareRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Star.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Star.tsx index 29002a055..8c67e8959 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Star.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Star.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -16,8 +16,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'StarRegular' -const StarRegular = memo(themed(Icon)) -export { StarRegular } + ); +}; +Icon.displayName = 'StarRegular'; +const StarRegular = memo(themed(Icon)); +export { StarRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/StarFill.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/StarFill.tsx index 66b3455ba..3454e3efc 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/StarFill.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/StarFill.tsx @@ -1,16 +1,22 @@ -import { memo } from 'react' -import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( - <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size} fill={`${color}`}> + <_Svg + viewBox="0 0 256 256" + {...otherProps} + height={size} + width={size} + fill={`${color}`} + > <_Rect width="256" height="256" fill="none" /> <_Path d="M239.2,97.4A16.4,16.4,0,0,0,224.6,86l-59.4-4.1-22-55.5A16.4,16.4,0,0,0,128,16h0a16.4,16.4,0,0,0-15.2,10.4L90.4,82.2,31.4,86A16.5,16.5,0,0,0,16.8,97.4,16.8,16.8,0,0,0,22,115.5l45.4,38.4L53.9,207a18.5,18.5,0,0,0,7,19.6,18,18,0,0,0,20.1.6l46.9-29.7h.2l50.5,31.9a16.1,16.1,0,0,0,8.7,2.6,16.5,16.5,0,0,0,15.8-20.8l-14.3-58.1L234,115.5A16.8,16.8,0,0,0,239.2,97.4Z" /> - ) -} -Icon.displayName = 'StarFill' -const StarFill = memo(themed(Icon)) -export { StarFill } + ); +}; +Icon.displayName = 'StarFill'; +const StarFill = memo(themed(Icon)); +export { StarFill }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Sun.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Sun.tsx index e2f9f5327..d4ef793b7 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Sun.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Sun.tsx @@ -1,11 +1,16 @@ -import React, { memo } from 'react' -import { Circle as _Circle, Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg' +import React, { memo } from 'react'; +import { + Circle as _Circle, + Line as _Line, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; -import { themed } from './themed' -import { IconProps } from './IconProps' +import { themed } from './themed'; +import { IconProps } from './IconProps'; const Icon = (props: IconProps) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -108,9 +113,9 @@ const Icon = (props: IconProps) => { strokeWidth="16" /> - ) -} + ); +}; -Icon.displayName = 'SunRegular' +Icon.displayName = 'SunRegular'; -export const SunRegular = memo(themed(Icon)) +export const SunRegular = memo(themed(Icon)); diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/TextBolder.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/TextBolder.tsx index e2f754a55..ea5910a96 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/TextBolder.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/TextBolder.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -16,8 +16,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'TextBolderRegular' -const TextBolderRegular = memo(themed(Icon)) -export { TextBolderRegular } + ); +}; +Icon.displayName = 'TextBolderRegular'; +const TextBolderRegular = memo(themed(Icon)); +export { TextBolderRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/TextItalic.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/TextItalic.tsx index 661aabffa..3bea4274d 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/TextItalic.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/TextItalic.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -41,8 +41,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'TextItalicRegular' -const TextItalicRegular = memo(themed(Icon)) -export { TextItalicRegular } + ); +}; +Icon.displayName = 'TextItalicRegular'; +const TextItalicRegular = memo(themed(Icon)); +export { TextItalicRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/TextStrikethrough.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/TextStrikethrough.tsx index e60ae0285..03595fc1e 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/TextStrikethrough.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/TextStrikethrough.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Line as _Line, Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Line as _Line, + Path as _Path, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -35,8 +40,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'TextStrikethroughRegular' -const TextStrikethroughRegular = memo(themed(Icon)) -export { TextStrikethroughRegular } + ); +}; +Icon.displayName = 'TextStrikethroughRegular'; +const TextStrikethroughRegular = memo(themed(Icon)); +export { TextStrikethroughRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/TextUnderline.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/TextUnderline.tsx index fac0150c8..f6fc42c0c 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/TextUnderline.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/TextUnderline.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Line as _Line, Path as _Path, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Line as _Line, + Path as _Path, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -27,8 +32,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'TextUnderlineRegular' -const TextUnderlineRegular = memo(themed(Icon)) -export { TextUnderlineRegular } + ); +}; +Icon.displayName = 'TextUnderlineRegular'; +const TextUnderlineRegular = memo(themed(Icon)); +export { TextUnderlineRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/Warning.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/Warning.tsx index 2bdcd29d8..19f74749c 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/Warning.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/Warning.tsx @@ -1,15 +1,15 @@ -import { memo } from 'react' +import { memo } from 'react'; import { Circle as _Circle, Line as _Line, Path as _Path, Rect as _Rect, Svg as _Svg, -} from 'react-native-svg' -import { themed } from './themed' +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -34,8 +34,8 @@ const Icon = (props) => { /> <_Circle cx="128" cy="180" r="12" fill={`${color}`} /> - ) -} -Icon.displayName = 'WarningRegular' -const WarningRegular = memo(themed(Icon)) -export { WarningRegular } + ); +}; +Icon.displayName = 'WarningRegular'; +const WarningRegular = memo(themed(Icon)); +export { WarningRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/WarningCircle.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/WarningCircle.tsx index 395c49dd0..705150eaf 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/WarningCircle.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/WarningCircle.tsx @@ -1,9 +1,14 @@ -import { memo } from 'react' -import { Circle as _Circle, Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { + Circle as _Circle, + Line as _Line, + Rect as _Rect, + Svg as _Svg, +} from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -29,8 +34,8 @@ const Icon = (props) => { /> <_Circle cx="128" cy="172" r="12" fill={`${color}`} /> - ) -} -Icon.displayName = 'WarningCircleRegular' -const WarningCircleRegular = memo(themed(Icon)) -export { WarningCircleRegular } + ); +}; +Icon.displayName = 'WarningCircleRegular'; +const WarningCircleRegular = memo(themed(Icon)); +export { WarningCircleRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/X.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/X.tsx index d65ae4355..06c7d71fd 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/X.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/X.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react' -import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg' -import { themed } from './themed' +import { memo } from 'react'; +import { Line as _Line, Rect as _Rect, Svg as _Svg } from 'react-native-svg'; +import { themed } from './themed'; const Icon = (props) => { - const { color = 'black', size = 24, ...otherProps } = props + const { color = 'black', size = 24, ...otherProps } = props; return ( <_Svg viewBox="0 0 256 256" {...otherProps} height={size} width={size}> <_Rect width="256" height="256" fill="none" /> @@ -28,8 +28,8 @@ const Icon = (props) => { strokeWidth="16" /> - ) -} -Icon.displayName = 'XRegular' -const XRegular = memo(themed(Icon)) -export { XRegular } + ); +}; +Icon.displayName = 'XRegular'; +const XRegular = memo(themed(Icon)); +export { XRegular }; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/index.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/index.tsx index d13c20bc1..da5147cb0 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/index.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/index.tsx @@ -1,34 +1,34 @@ -export * from './CaretDown' -export * from './CaretDoubleRight' -export * from './CaretDoubleLeft' -export * from './CaretLeft' -export * from './CaretRight' -export * from './ArrowLeft' -export * from './ArrowRight' -export * from './Calendar' -export * from './X' -export * from './WarningCircle' -export * from './Warning' -export * from './CheckCircle' -export * from './Info' -export * from './ListPlus' -export * from './Square' -export * from './CheckSquare' -export * from './Check' -export * from './CaretUp' -export * from './Star' -export * from './StarFill' -export * from './Eye' -export * from './EyeSlash' -export * from './IconProps' -export * from './ArrowClockwise' -export * from './ArrowCounterClockwise' -export * from './List' -export * from './ListNumbers' -export * from './Quotes' -export * from './TextBolder' -export * from './TextItalic' -export * from './TextStrikethrough' -export * from './TextUnderline' -export * from './Sun' -export * from './Minus' +export * from './CaretDown'; +export * from './CaretDoubleRight'; +export * from './CaretDoubleLeft'; +export * from './CaretLeft'; +export * from './CaretRight'; +export * from './ArrowLeft'; +export * from './ArrowRight'; +export * from './Calendar'; +export * from './X'; +export * from './WarningCircle'; +export * from './Warning'; +export * from './CheckCircle'; +export * from './Info'; +export * from './ListPlus'; +export * from './Square'; +export * from './CheckSquare'; +export * from './Check'; +export * from './CaretUp'; +export * from './Star'; +export * from './StarFill'; +export * from './Eye'; +export * from './EyeSlash'; +export * from './IconProps'; +export * from './ArrowClockwise'; +export * from './ArrowCounterClockwise'; +export * from './List'; +export * from './ListNumbers'; +export * from './Quotes'; +export * from './TextBolder'; +export * from './TextItalic'; +export * from './TextStrikethrough'; +export * from './TextUnderline'; +export * from './Sun'; +export * from './Minus'; diff --git a/packages/ui/src/extras/lib/core/src/core/content/icons/themed.tsx b/packages/ui/src/extras/lib/core/src/core/content/icons/themed.tsx index 77b01b8ac..7acc8291f 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/icons/themed.tsx +++ b/packages/ui/src/extras/lib/core/src/core/content/icons/themed.tsx @@ -1,23 +1,29 @@ -import { getTokens, getVariable, getVariableValue, useProps, useTheme } from 'tamagui' -import React from 'react' +import { + getTokens, + getVariable, + getVariableValue, + useProps, + useTheme, +} from 'tamagui'; +import React from 'react'; export function themed(Component: A) { const wrapped = (propsIn: any) => { - const props = useProps(propsIn) - const theme = useTheme() + const props = useProps(propsIn); + const theme = useTheme(); const color = getVariable( (props.color in theme ? theme[props.color] : undefined) || props.color || (!props.disableTheme ? theme.color : null) || - '#000' - ) + '#000', + ); const size = typeof props.size === 'string' ? getVariableValue(getTokens().size[props.size] || props.size) - : props.size + : props.size; // @ts-ignore - return - } - return wrapped as unknown as A + return ; + }; + return wrapped as unknown as A; } diff --git a/packages/ui/src/extras/lib/core/src/core/content/index.ts b/packages/ui/src/extras/lib/core/src/core/content/index.ts index 1162359e7..7f625daf6 100644 --- a/packages/ui/src/extras/lib/core/src/core/content/index.ts +++ b/packages/ui/src/extras/lib/core/src/core/content/index.ts @@ -1,6 +1,6 @@ -export * from './LmAlert' -export * from './LmAvatar' -export * from './LmCard' -export * from './LmImage' -export * from './LmSkeleton' -export * from './LmGrid' +export * from './LmAlert'; +export * from './LmAvatar'; +export * from './LmCard'; +export * from './LmImage'; +export * from './LmSkeleton'; +export * from './LmGrid'; diff --git a/packages/ui/src/extras/lib/core/src/core/form/LmButton.tsx b/packages/ui/src/extras/lib/core/src/core/form/LmButton.tsx index 878982489..14991a7cf 100644 --- a/packages/ui/src/extras/lib/core/src/core/form/LmButton.tsx +++ b/packages/ui/src/extras/lib/core/src/core/form/LmButton.tsx @@ -1,17 +1,17 @@ -import { Button, ButtonProps, Spinner, TamaguiComponent } from 'tamagui' -import { colormap, ThemeColors } from '../themeMappings' -import { forwardRef } from 'react' +import { Button, ButtonProps, Spinner, TamaguiComponent } from 'tamagui'; +import { colormap, ThemeColors } from '../themeMappings'; +import { forwardRef } from 'react'; export type LmButtonProps = ButtonProps & { - colorVariant?: ThemeColors - loading?: boolean -} + colorVariant?: ThemeColors; + loading?: boolean; +}; export const LmButton = forwardRef(function LmButtonFunc( { loading, colorVariant, ...props }: LmButtonProps, - ref + ref, ) { - const { theme } = props + const { theme } = props; return (