Skip to content

Commit 28a51a6

Browse files
yceffortyceffort
authored
Merge pull request #23 from titicacadev/bug/change-install-link-color-inherit
🐛 app 설치 버튼 링크 클릭시 색 변하는 문제 수정
2 parents 184250e + 553c368 commit 28a51a6

File tree

15 files changed

+52
-35
lines changed

15 files changed

+52
-35
lines changed

‎docs/package.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "@titicaca/triple-frontend-docs",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"private": true,
55
"description": "Documentation project for triple-frontend packages",
66
"scripts": {
77
"dev": "start-storybook -p 6006 -s ./public",
88
"build": "build-storybook -s ./public"
99
},
1010
"dependencies": {
11-
"@titicaca/author": "^1.0.0-alpha.6",
12-
"@titicaca/listing-filter": "^1.0.0-alpha.6",
13-
"@titicaca/poi-list-elements": "^1.0.0-alpha.6",
14-
"@titicaca/triple-design-system": "^1.0.0-alpha.6",
15-
"@titicaca/triple-document": "^1.0.0-alpha.6"
11+
"@titicaca/author": "^1.0.0-alpha.7",
12+
"@titicaca/floating-install-button": "^1.0.0-alpha.7",
13+
"@titicaca/listing-filter": "^1.0.0-alpha.7",
14+
"@titicaca/poi-list-elements": "^1.0.0-alpha.7",
15+
"@titicaca/triple-design-system": "^1.0.0-alpha.7",
16+
"@titicaca/triple-document": "^1.0.0-alpha.7"
1617
},
1718
"devDependencies": {
1819
"@storybook/addon-actions": "^5.0.3",

‎docs/stories/button.stories.js

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { action } from '@storybook/addon-actions'
55
import { text, number, select, boolean } from '@storybook/addon-knobs'
66

77
import { Button } from '@titicaca/triple-design-system'
8+
import FloatingInstallButton from '@titicaca/floating-install-button'
89

910
storiesOf('Button', module)
1011
.add('일반', () => (
@@ -102,3 +103,9 @@ storiesOf('Button', module)
102103
<Button icon="share">공유하기</Button>
103104
</Button.Group>
104105
))
106+
.add('플로팅 설치 버튼 (모바일 only)', () => (
107+
<FloatingInstallButton
108+
isPublic={true}
109+
appInstallLink="https://triple.guide"
110+
/>
111+
))

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"packages/*",
55
"tests"
66
],
7-
"version": "1.0.0-alpha.6"
7+
"version": "1.0.0-alpha.7"
88
}

‎packages/author/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/author",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "Triple Author UI elements",
55
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
66
"main": "lib/index.js",
@@ -15,6 +15,6 @@
1515
"url": "https://github.com/titicacadev/triple-frontend/issues"
1616
},
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.6"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.7"
1919
}
2020
}

‎packages/floating-install-button/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/floating-install-button",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "floating triple install button",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",
@@ -23,6 +23,6 @@
2323
},
2424
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
2525
"dependencies": {
26-
"@titicaca/triple-design-system": "^1.0.0-alpha.6"
26+
"@titicaca/triple-design-system": "^1.0.0-alpha.7"
2727
}
2828
}

‎packages/floating-install-button/src/index.tsx

+12-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ const InstallDescription = styled(Text)`
3232
color: rgb(${GetGlobalColor('white')});
3333
`
3434

35+
const InstallAnchor = styled.a`
36+
&:visited,
37+
&:hover,
38+
&:active {
39+
color: inherit;
40+
}
41+
`
42+
3543
const Description = styled(Text)`
3644
width: 200px;
3745
height: 15px;
@@ -75,7 +83,7 @@ export default function FloatingInstallButton({
7583

7684
React.useEffect(() => {
7785
const visitedPages = window.sessionStorage.getItem(CLOSE_INSTALL_BUTTON_KEY)
78-
if (!visitedPages) {
86+
if (!visitedPages && !buttonVisibility) {
7987
setButtonVisibility(true)
8088
sendTrackEventRequest(trackEventParams && trackEventParams.onShow)
8189
}
@@ -89,16 +97,17 @@ export default function FloatingInstallButton({
8997

9098
const onSelect = () => {
9199
sendTrackEventRequest(trackEventParams && trackEventParams.onSelect)
100+
return true
92101
}
93102

94103
return buttonVisibility && isPublic ? (
95104
<FloatingButton>
96105
<Container floated="left">
97106
<InstallDescription>
98-
<a href={appInstallLink} onClick={onSelect}>
107+
<InstallAnchor href={appInstallLink} onClick={onSelect}>
99108
<Container floated="left">트리플 앱 설치하기</Container>
100109
<GoAppButton src="https://assets.triple.guide/images/[email protected]" />
101-
</a>
110+
</InstallAnchor>
102111
</InstallDescription>
103112
<Description>가이드북, 일정짜기, 길찾기, 맛집</Description>
104113
</Container>

‎packages/image-carousel/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/image-carousel",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "Triple Image Carousel",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.6",
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.7",
1919
"nuka-carousel": "4.4.1"
2020
}
2121
}

‎packages/listing-filter/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/listing-filter",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "Listing filter UI",
55
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
66
"main": "lib/index.js",

‎packages/poi-list-elements/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/poi-list-elements",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "Triple POI UI Elements",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.6",
19-
"@titicaca/view-utilities": "^1.0.0-alpha.6"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.7",
19+
"@titicaca/view-utilities": "^1.0.0-alpha.7"
2020
}
2121
}

‎packages/product-list-elements/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/product-list-elements",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "Triple Product UI Elements",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.6",
19-
"@titicaca/view-utilities": "^1.0.0-alpha.6"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.7",
19+
"@titicaca/view-utilities": "^1.0.0-alpha.7"
2020
}
2121
}

‎packages/review/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/review",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "UI Components for User Reviews from Triple Service",
55
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
66
"main": "lib/index.js",
@@ -15,6 +15,6 @@
1515
"url": "https://github.com/titicacadev/triple-frontend/issues"
1616
},
1717
"dependencies": {
18-
"@titicaca/triple-design-system": "^1.0.0-alpha.6"
18+
"@titicaca/triple-design-system": "^1.0.0-alpha.7"
1919
}
2020
}

‎packages/triple-design-system/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-design-system",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "Triple Design System Library",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",
@@ -23,7 +23,7 @@
2323
},
2424
"homepage": "https://github.com/titicacadev/triple-design-system#readme",
2525
"dependencies": {
26-
"@titicaca/view-utilities": "^1.0.0-alpha.6",
26+
"@titicaca/view-utilities": "^1.0.0-alpha.7",
2727
"nuka-carousel": "4.4.1",
2828
"react-addons-css-transition-group": "^15.6.2",
2929
"react-input-mask": "^2.0.4"

‎packages/triple-document/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-document",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "TripleDocument: Formatted Content System",
55
"main": "lib/index.js",
66
"files": [
@@ -15,7 +15,7 @@
1515
},
1616
"homepage": "https://github.com/titicacadev/triple-frontend#readme",
1717
"dependencies": {
18-
"@titicaca/poi-list-elements": "^1.0.0-alpha.6",
19-
"@titicaca/triple-design-system": "^1.0.0-alpha.6"
18+
"@titicaca/poi-list-elements": "^1.0.0-alpha.7",
19+
"@titicaca/triple-design-system": "^1.0.0-alpha.7"
2020
}
2121
}

‎packages/view-utilities/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/view-utilities",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"description": "Utilities for Triple view libraries and applications",
55
"main": "lib/index.js",
66
"files": [

‎tests/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@titicaca/triple-frontend-tests",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"private": true,
55
"description": "Triple Design Systems Test",
66
"scripts": {
@@ -25,9 +25,9 @@
2525
"webpack-cli": "^3.1.2"
2626
},
2727
"dependencies": {
28-
"@titicaca/author": "^1.0.0-alpha.6",
29-
"@titicaca/triple-design-system": "^1.0.0-alpha.6",
30-
"@titicaca/triple-document": "^1.0.0-alpha.6",
28+
"@titicaca/author": "^1.0.0-alpha.7",
29+
"@titicaca/triple-design-system": "^1.0.0-alpha.7",
30+
"@titicaca/triple-document": "^1.0.0-alpha.7",
3131
"koa": "^2.5.3",
3232
"koa-static": "^5.0.0",
3333
"react": "^16.4.2",

0 commit comments

Comments
 (0)