Skip to content

Commit 6a91d29

Browse files
authored
Merge pull request #21 from line/for-mini
feat: handling liff id for mini
2 parents bba906b + 3251648 commit 6a91d29

File tree

7 files changed

+24
-13
lines changed

7 files changed

+24
-13
lines changed

.env

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
VITE_LIFF_ID=1656508316-k7jNojXm
1+
VITE_LIFF_ID=1656508316-k7jNojXm
2+
3+
# TODO
4+
VITE_LIFF_ID_MINI=

src/App.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import styles from './App.module.css'
44
import Header from './components/Header'
55
import Snippet from './components/Snippet'
66
import Input from './components/Input'
7-
import { FilterContext, FilterTypes } from './Context'
7+
import { FilterContext, FilterType } from './Context'
88
import qrCode from './qr-code.png'
99
import { SHARE_TARGET_PICKER_FIXED_ARGUMENT_LIST } from './constants'
1010

11-
const isMINI = new URLSearchParams(location.search).has('mini')
12-
const filter = isMINI ? FilterTypes.MINI : FilterTypes.LIFF
11+
type Props = {
12+
filter: FilterType;
13+
};
1314

14-
function App() {
15+
function App({ filter }: Props) {
1516
let isLoggedIn = false
1617
try {
1718
isLoggedIn = liff.isLoggedIn()

src/Context.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import React from 'react'
2-
3-
export const FilterTypes = {
4-
LIFF: 'LIFF',
5-
MINI: 'MINI'
6-
} as const
2+
import { FilterTypes } from './FilterTypes'
73

84
export type FilterType = keyof typeof FilterTypes
95

src/FilterTypes.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export const FilterTypes = {
2+
LIFF: 'LIFF',
3+
MINI: 'MINI'
4+
} as const

src/components/Snippet.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import Input from './Input'
44
import styles from './Snippet.module.css'
55
import Tag from './Tag'
66
import TextArea from './TextArea'
7-
import { FilterContext, FilterTypes } from '../Context'
7+
import { FilterContext } from '../Context'
8+
import { FilterTypes } from '../FilterTypes'
89
import Pulldown from './Pulldown'
910

1011
interface SippetProps {

src/main.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ import React from 'react'
33
import ReactDOM from 'react-dom'
44
import './main.css'
55
import App from './App'
6+
import { FilterTypes } from './FilterTypes'
7+
8+
const isMINI = new URLSearchParams(location.search).has('mini')
9+
const filter = isMINI ? FilterTypes.MINI : FilterTypes.LIFF
10+
const liffId = isMINI ? import.meta.env.VITE_LIFF_ID_MINI : import.meta.env.VITE_LIFF_ID
611

712
liff
8-
.init({ liffId: import.meta.env.VITE_LIFF_ID || '' })
13+
.init({ liffId })
914
.then(() => {
1015
ReactDOM.render(
1116
<React.StrictMode>
12-
<App />
17+
<App filter={filter} />
1318
</React.StrictMode>,
1419
document.getElementById('root')
1520
)

src/vite-env.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
interface ImportMetaEnv {
44
readonly VITE_LIFF_ID: string;
5+
readonly VITE_LIFF_ID_MINI: string;
56
}
67

78
interface ImportMeta {

0 commit comments

Comments
 (0)