Skip to content

Master <= develop ledpicker 사이즈 대응 #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tnks2U merged 4 commits into from
Dec 24, 2024
Merged

Master <= develop ledpicker 사이즈 대응 #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc87b24
feat: ledPicker 사이즈변경 대응
Tnks2U Dec 18, 2024
1086192
Merge pull request #463 from entrylabs/issue/8917
Tnks2U Dec 19, 2024
335988b
fix: ledpicker width 계산식 수정
Tnks2U Dec 20, 2024
e2e6901
Merge pull request #464 from entrylabs/issue/8917
Tnks2U Dec 20, 2024
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
3 changes: 0 additions & 3 deletions src/assets/entry/scss/common/_tooltip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,11 @@
user-select: none;
z-index: 251;
font-size: 14px;
width: 224px;
height: 296.8px;
background-color: '#d6e9f4';
border-radius: 2px;
box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.25);
border: solid 1px #bfd8e6;
position: fixed;
// transition: all ease 0.3s;
padding: 0;
}

Expand Down
14 changes: 13 additions & 1 deletion src/components/ledPicker/ledPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ class LedPicker extends Component {
return 9;
}

get CONTAINER_WIDTH() {
return 26 + this.state.ledStatus.length * 40;
}

get CONTAINER_HEIGHT() {
return 101 + this.state.ledStatus[0].length * 39;
}

constructor(props) {
super(props);
this.theme = Theme.getStyle('popup');
Expand Down Expand Up @@ -257,7 +265,11 @@ class LedPicker extends Component {
ref={(dom) => {
this.ledPicker = dom;
}}
style={ledPickerStyle}
style={{
...ledPickerStyle,
width: this.CONTAINER_WIDTH,
height: this.CONTAINER_HEIGHT,
}}
onClick={onClick}
className={`${this.theme.tooltip_box} ${this.theme.led_picker} ${
isUpStyle ? this.theme.up : ''
Expand Down
Loading