Skip to content

Commit

Permalink
Merge pull request #380 from frankcalise/fix/373
Browse files Browse the repository at this point in the history
  • Loading branch information
pvinis authored Apr 11, 2024
2 parents 3ebded0 + 94290df commit dbaab4e
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
6 changes: 6 additions & 0 deletions src/components/common/VersionSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,16 @@ const VersionSelector = ({
isPackageNameDefinedInURL,
showDiff,
showReleaseCandidates,
appPackage,
appName,
}: {
packageName: string
language: string
isPackageNameDefinedInURL: boolean
showDiff: (args: { fromVersion: string; toVersion: string }) => void
showReleaseCandidates: boolean
appPackage: string
appName: string
}) => {
const { isLoading, isDone, releaseVersions } = useFetchReleaseVersions({
packageName,
Expand Down Expand Up @@ -363,6 +367,8 @@ const VersionSelector = ({
isPackageNameDefinedInURL,
fromVersion: localFromVersion,
toVersion: localToVersion,
appPackage,
appName,
})
}

Expand Down
21 changes: 19 additions & 2 deletions src/components/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Card, Input, Typography, ConfigProvider, theme } from 'antd'
import GitHubButton, { ReactGitHubButtonProps } from 'react-github-btn'
import ReactGA from 'react-ga'
import createPersistedState from 'use-persisted-state'
import queryString from 'query-string'
import VersionSelector from '../common/VersionSelector'
import DiffViewer from '../common/DiffViewer'
import Settings from '../common/Settings'
Expand Down Expand Up @@ -107,6 +108,19 @@ const SettingsContainer = styled.div`
flex: 1;
`

const getAppInfoInURL = (): {
appPackage: string
appName: string
} => {
// 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,
}
}

interface StarButtonProps extends ReactGitHubButtonProps {
className?: string
}
Expand Down Expand Up @@ -138,8 +152,9 @@ const Home = () => {
[`${SHOW_LATEST_RCS}`]: false,
})

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

// Avoid UI lag when typing.
const deferredAppName = useDeferredValue(appName)
Expand Down Expand Up @@ -303,6 +318,8 @@ const Home = () => {
packageName={packageName}
language={language}
isPackageNameDefinedInURL={isPackageNameDefinedInURL}
appPackage={appPackage}
appName={appName}
/>
</Container>
{/*
Expand Down
10 changes: 10 additions & 0 deletions src/utils/update-url.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ export function updateURL({
isPackageNameDefinedInURL,
fromVersion,
toVersion,
appPackage,
appName,
}: {
packageName: string
language: string
isPackageNameDefinedInURL: boolean
fromVersion: string
toVersion: string
appPackage: string
appName: string
}) {
const url = new URL(window.location.origin)
url.pathname = window.location.pathname
Expand All @@ -29,6 +33,12 @@ export function updateURL({
if (packageName === PACKAGE_NAMES.RNW) {
url.searchParams.set('language', language)
}
if (appPackage) {
url.searchParams.set('package', appPackage)
}
if (appName) {
url.searchParams.set('name', appName)
}

window.history.replaceState(null, '', url.toString())
}

0 comments on commit dbaab4e

Please sign in to comment.