Skip to content
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

[#8802] 마이크로비트 ledpicker 추가기능 구현 #460

Merged
merged 3 commits into from
Nov 26, 2024
Merged

[#8802] 마이크로비트 ledpicker 추가기능 구현 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ee5492
lint 적용
Tnks2U Nov 25, 2024
623a5ea
feat: ledpicker 클릭시 밝기순서 변경
Tnks2U Nov 25, 2024
b940d15
feat: ledpicker longPress 구현
Tnks2U Nov 26, 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
57 changes: 39 additions & 18 deletions src/components/ledPicker/ledPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { debounce } from 'lodash';
import root from 'window-or-global';
import produce from 'immer';
import Theme from '@utils/Theme';
import Dropdown from '@components/widget/dropdown';

let timer = null;
let islongPress = false;

class LedPicker extends Component {
get PICKER_WIDTH() {
Expand Down Expand Up @@ -166,7 +168,7 @@ class LedPicker extends Component {
},
};
}
_handleLedStatusChange = ({ x, y, isReset, value }) => {
_handleLedStatusChange = ({ x, y, isReset, resetOne }) => {
const { onChangeLedPicker, withLevel, maxBrightness } = this.props;
const status = this.state.ledStatus;
const targetBrightness = maxBrightness || 1;
Expand All @@ -178,9 +180,13 @@ class LedPicker extends Component {
}
} else {
if (withLevel) {
status[x][y] += 1;
if (status[x][y] > 9) {
if (resetOne) {
status[x][y] = 0;
} else {
status[x][y] -= 1;
if (status[x][y] < 0) {
status[x][y] = 9;
}
}
} else {
if (status[x][y] == targetBrightness) {
Expand All @@ -201,6 +207,25 @@ class LedPicker extends Component {
);
};

_handleMouseDown = (x, y) => (e) => {
timer = setTimeout(() => {
this._handleLedStatusChange({ x, y, isReset: false, resetOne: true });
islongPress = true;
}, 500);
};

_handleMouseUp = (x, y) => (e) => {
if (timer) {
clearTimeout(timer);
timer = null;
}
if (islongPress) {
islongPress = false;
} else {
this._handleLedStatusChange({ x, y, isReset: false });
}
};

render() {
const {
className,
Expand Down Expand Up @@ -243,23 +268,18 @@ class LedPicker extends Component {
{ledStatus.map((leds, x) =>
leds.map((led, y) => {
const brightness = ledStatus[x][y];
const targetStyle = this.theme[
`led_item_selected_${brightness}`
];
const targetStyle =
this.theme[`led_item_selected_${brightness}`];
const key = `led${x}${y}`;

return (
<div
className={`${this.theme.led_item} ${brightness > 0 &&
this.theme.led_item_selected} ${targetStyle}`}
className={`${this.theme.led_item} ${
brightness > 0 && this.theme.led_item_selected
} ${targetStyle}`}
key={key}
onClick={() => {
this._handleLedStatusChange({
x,
y,
isReset: false,
});
}}
onMouseDown={this._handleMouseDown(x, y)}
onMouseUp={this._handleMouseUp(x, y)}
>
<div className={`${this.theme.led_item_indicator}`}>
{brightness}
Expand All @@ -276,8 +296,9 @@ class LedPicker extends Component {
const brightness = ledStatus[x][y];
return (
<div
className={`${this.theme.led_item} ${brightness > 0 &&
this.theme.led_item_selected}`}
className={`${this.theme.led_item} ${
brightness > 0 && this.theme.led_item_selected
}`}
key={`led${x}${y}`}
onClick={() =>
this._handleLedStatusChange({
Expand Down
7 changes: 1 addition & 6 deletions src/components/ledPicker/ledPickerContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ const mapDispatchToProps = (dispatch) => ({

export default withWrapper({
type: 'microBitLedPicker',
})(
connect(
undefined,
mapDispatchToProps
)(LedPickerContainer)
);
})(connect(undefined, mapDispatchToProps)(LedPickerContainer));
// mapStateToProps,
// mapDispatchToProps