Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion src/components/common/VersionSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ const VersionSelector = ({
showDiff: (args: { fromVersion: string; toVersion: string }) => void
showReleaseCandidates: boolean
appPackage: string
appName: string
appName?: string
}) => {
const { isLoading, isDone, releaseVersions } = useFetchReleaseVersions({
packageName,
Expand Down
19 changes: 7 additions & 12 deletions src/components/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,13 @@ const SettingsContainer = styled.div`
flex: 1;
`

const getAppInfoInURL = (): {
appPackage: string
appName: string
} => {
const getAppInfoInURL = () => {
// Parses `/?name=RnDiffApp&package=com.rndiffapp` from URL
const { name, package: pkg } = queryString.parse(window.location.search)

return {
appPackage: pkg as string,
appName: name as string,
appName: name as string | null,
}
}

Expand Down Expand Up @@ -143,11 +140,11 @@ const Home = () => {
})

const appInfoInURL = getAppInfoInURL()
const [appName, setAppName] = useState<string>(appInfoInURL.appName)
const [appPackage, setAppPackage] = useState<string>(appInfoInURL.appPackage)
const [appName, setAppName] = useState(appInfoInURL.appName)
const [appPackage, setAppPackage] = useState(appInfoInURL.appPackage)

// Avoid UI lag when typing.
const deferredAppName = useDeferredValue(appName)
const deferredAppName = useDeferredValue(appName || DEFAULT_APP_NAME)
const deferredAppPackage = useDeferredValue(appPackage)

const homepageUrl = process.env.PUBLIC_URL
Expand Down Expand Up @@ -281,7 +278,7 @@ const Home = () => {
<Input
size="large"
placeholder={DEFAULT_APP_NAME}
value={appName}
value={appName || ''}
onChange={({ target }) => setAppName((value) => target.value)}
/>
</AppNameField>
Expand Down Expand Up @@ -322,9 +319,7 @@ const Home = () => {
shouldShowDiff={shouldShowDiff}
fromVersion={fromVersion}
toVersion={toVersion}
appName={
deferredAppName !== DEFAULT_APP_NAME ? deferredAppName : ''
}
appName={deferredAppName}
appPackage={
deferredAppPackage !== DEFAULT_APP_PACKAGE
? deferredAppPackage
Expand Down
2 changes: 1 addition & 1 deletion src/utils/update-url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function updateURL({
fromVersion: string
toVersion: string
appPackage: string
appName: string
appName?: string
}) {
const url = new URL(window.location.origin)
url.pathname = window.location.pathname
Expand Down