Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
kus-admin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Кубота
kus-admin
Commits
2b93f563
Commit
2b93f563
authored
Jan 30, 2020
by
Иван Кубота
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debounce resize event
Add mobile slider behaviour and paddings
parent
9e7938e0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
24 deletions
+81
-24
main.jsx
src/main.jsx
+5
-2
CardSlider.jsx
src/view/cmp/cardSlider/CardSlider.jsx
+72
-22
CardSlider.scss
src/view/cmp/cardSlider/CardSlider.scss
+4
-0
No files found.
src/main.jsx
View file @
2b93f563
...
@@ -24,13 +24,16 @@ export default function() {
...
@@ -24,13 +24,16 @@ export default function() {
)
}
)
}
</
div
>;
</
div
>;
const
w
=
window
;
const
w
=
window
;
w
.
addEventListener
(
'resize'
,
function
()
{
let
resizeFn
;
w
.
addEventListener
(
'resize'
,
Store
.
debounce
(
resizeFn
=
function
()
{
tmpStore
.
set
({
tmpStore
.
set
({
isMobile
:
w
.
innerWidth
<
1025
,
isMobile
:
w
.
innerWidth
<
1025
,
width
:
w
.
innerWidth
width
:
w
.
innerWidth
});
});
});
},
1000
/
20
));
resizeFn
();
tmpStore
.
set
(
'loaded'
,
true
);
tmpStore
.
set
(
'loaded'
,
true
);
};
};
src/view/cmp/cardSlider/CardSlider.jsx
View file @
2b93f563
...
@@ -8,39 +8,62 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
...
@@ -8,39 +8,62 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
hash
=
{},
hash
=
{},
items
=
[],
items
=
[],
cardWidth
=
160
,
cardWidth
=
160
,
minPadding
=
20
,
minPadding
=
10
,
mobilePadding
=
10
,
wrap
,
wrap
,
width
,
width
,
fullCardsCount
,
fullCardsCount
,
padding
,
padding
,
updateSize
=
function
()
{
updateSize
=
function
()
{
width
=
dom
.
clientWidth
;
width
=
dom
.
clientWidth
-
paddingLeft
-
paddingRight
;
fullCardsCount
=
width
/
(
cardWidth
+
minPadding
)
|
0
;
fullCardsCount
=
width
/
(
cardWidth
+
minPadding
)
|
0
;
padding
=
(
width
-
fullCardsCount
*
cardWidth
)
/
(
fullCardsCount
-
1
);
padding
=
mobile
?
mobilePadding
:
(
width
-
fullCardsCount
*
cardWidth
)
/
(
fullCardsCount
-
1
);
wrap
.
style
.
width
=
(
items
.
length
*
(
padding
+
cardWidth
)
-
padding
)
+
'px'
;
wrap
.
style
.
width
=
(
items
.
length
*
(
padding
+
cardWidth
)
-
padding
)
+
'px'
;
},
},
update
=
function
()
{
update
=
function
()
{
updateSize
();
updateSize
();
updateVisibleDom
();
updateVisibleDom
();
};
};
let
paddingLeft
=
30
,
paddingRight
=
30
,
mobile
=
false
;
tmpStore
.
sub
(
'width'
,
Store
.
debounce
(
function
(
w
)
{
let
firstItem
=
Math
.
round
(
dom
.
scrollLeft
/
(
cardWidth
+
padding
));
console
.
log
(
firstItem
);
update
();
dom
.
scrollLeft
=
firstItem
*
(
cardWidth
+
padding
);
},
30
));
let
waitTimeout
=
false
;
let
waitTimeout
=
false
;
let
tuning
=
false
;
let
tuning
;
let
leftestItem
=
0
;
let
leftestItem
=
0
;
let
lastLeftestItem
=
0
;
let
lastLeftestItem
=
0
;
let
tuneScrollPosition
=
function
()
{
let
leftButtonDisabled
=
new
Store
.
Value
.
Boolean
(
true
),
rightButtonDisabled
=
new
Store
.
Value
.
Boolean
(
true
);
let
updateButtonsState
=
function
()
{
let
fromLeft
=
dom
.
scrollLeft
;
let
firstItem
=
Math
.
round
(
fromLeft
/
(
cardWidth
+
padding
));
leftButtonDisabled
.
set
(
firstItem
===
0
);
rightButtonDisabled
.
set
(
firstItem
+
fullCardsCount
===
items
.
length
);
};
let
untune
=
function
()
{
updateButtonsState
();
tuning
=
false
;
};
let
tuneScrollPosition
=
function
(
x
)
{
if
(
tuning
)
return
untune
();
waitTimeout
=
false
;
waitTimeout
=
false
;
tuning
=
true
;
tuning
=
true
;
let
fromLeft
=
dom
.
scrollLeft
;
let
fromLeft
=
dom
.
scrollLeft
;
let
firstItem
=
Math
.
round
(
fromLeft
/
(
cardWidth
+
padding
)
-
(
lastLeftestItem
>
leftestItem
?
0.4
:
-
0.4
));
let
firstItem
,
toLeft
;
let
toLeft
=
Math
.
round
(
firstItem
*
(
cardWidth
+
padding
));
if
(
x
){
firstItem
=
Math
.
round
(
fromLeft
/
(
cardWidth
+
padding
));
if
(
firstItem
+
x
<
0
||
firstItem
+
fullCardsCount
+
x
>
items
.
length
){
return
untune
();
}
toLeft
=
Math
.
round
(
(
firstItem
+
x
)
*
(
cardWidth
+
padding
));
}
else
{
firstItem
=
Math
.
round
(
fromLeft
/
(
cardWidth
+
padding
)
-
(
lastLeftestItem
>
leftestItem
?
0.4
:
-
0.4
)
);
toLeft
=
Math
.
round
(
firstItem
*
(
cardWidth
+
padding
)
);
}
let
deltaMove
=
(
toLeft
-
fromLeft
)
/
Math
.
ceil
(
200
/
(
1000
/
60
));
let
deltaMove
=
(
toLeft
-
fromLeft
)
/
Math
.
ceil
(
200
/
(
1000
/
60
));
while
(
deltaMove
>
0
&&
deltaMove
<
1
)
{
while
(
deltaMove
>
0
&&
deltaMove
<
1
)
{
deltaMove
*=
2
;
deltaMove
*=
2
;
...
@@ -49,15 +72,15 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
...
@@ -49,15 +72,15 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
deltaMove
=
toLeft
-
fromLeft
;
deltaMove
=
toLeft
-
fromLeft
;
}
}
let
tune
=
function
()
{
let
tune
=
function
()
{
if
(
Math
.
abs
(
toLeft
-
dom
.
scrollLeft
)
>
(
cardWidth
+
padding
))
{
if
(
Math
.
abs
(
toLeft
-
dom
.
scrollLeft
)
>
(
cardWidth
+
padding
)
*
1.3
)
{
return
tuning
=
false
;
return
untune
()
;
}
}
if
(
Math
.
sign
(
toLeft
-
dom
.
scrollLeft
)
!==
Math
.
sign
(
deltaMove
))
{
if
(
Math
.
sign
(
toLeft
-
dom
.
scrollLeft
)
!==
Math
.
sign
(
deltaMove
))
{
return
tuning
=
false
;
return
untune
()
;
}
}
if
(
Math
.
abs
(
dom
.
scrollLeft
-
toLeft
)
<
Math
.
abs
(
deltaMove
))
{
if
(
Math
.
abs
(
dom
.
scrollLeft
-
toLeft
)
<
Math
.
abs
(
deltaMove
))
{
dom
.
scrollLeft
=
toLeft
;
dom
.
scrollLeft
=
toLeft
;
return
tuning
=
false
;
return
untune
()
;
}
else
{
}
else
{
dom
.
scrollLeft
+=
deltaMove
;
dom
.
scrollLeft
+=
deltaMove
;
requestAnimationFrame
(
tune
);
requestAnimationFrame
(
tune
);
...
@@ -66,7 +89,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
...
@@ -66,7 +89,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
if
(
Math
.
abs
(
deltaMove
)
>
0
)
{
if
(
Math
.
abs
(
deltaMove
)
>
0
)
{
requestAnimationFrame
(
tune
);
requestAnimationFrame
(
tune
);
}
else
{
}
else
{
tuning
=
false
;
return
untune
()
;
}
}
};
};
...
@@ -83,11 +106,25 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
...
@@ -83,11 +106,25 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
};
};
let
dom
;
let
dom
;
let
theDOM
=
<
div
class=
"card-slider"
>
let
theDOM
=
<
div
class=
"card-slider"
>
<
button
class=
"card-slider__control card-slider__control--prev"
type=
"button"
<
button
class=
{
D
.
cls
(
'card-slider__control'
,
'card-slider__control--prev'
,
{
'card-slider__control-disabled'
:
leftButtonDisabled
}
)
}
type=
"button"
onClick=
{
()
=>
{
tuneScrollPosition
(
-
1
);
}
}
aria
-
label=
"Показать предыдущую карточку"
>
aria
-
label=
"Показать предыдущую карточку"
>
<
ArrPrev
width=
"14"
height=
"12"
/>
<
ArrPrev
width=
"14"
height=
"12"
/>
</
button
>
</
button
>
<
button
className=
"card-slider__control card-slider__control--next"
type=
"button"
<
button
class=
{
D
.
cls
(
'card-slider__control'
,
'card-slider__control--next'
,
{
'card-slider__control-disabled'
:
rightButtonDisabled
}
)
}
type=
"button"
onClick=
{
()
=>
{
tuneScrollPosition
(
1
);
}
}
aria
-
label=
"Показать предыдущую карточку"
>
aria
-
label=
"Показать предыдущую карточку"
>
<
ArrNext
width=
"14"
height=
"12"
/>
<
ArrNext
width=
"14"
height=
"12"
/>
</
button
>
</
button
>
...
@@ -137,7 +174,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
...
@@ -137,7 +174,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
}
}
}
}
for
(
let
i
=
from
;
i
<
to
;
i
++
)
{
for
(
let
i
=
from
;
i
<
to
;
i
++
)
{
let
x
=
i
*
(
cardWidth
+
padding
);
let
x
=
paddingLeft
+
i
*
(
cardWidth
+
padding
);
if
(
hash
[
i
].
x
!==
x
)
{
if
(
hash
[
i
].
x
!==
x
)
{
hash
[
i
].
dom
.
style
.
left
=
(
hash
[
i
].
x
=
x
)
+
'px'
;
hash
[
i
].
dom
.
style
.
left
=
(
hash
[
i
].
x
=
x
)
+
'px'
;
}
}
...
@@ -151,7 +188,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
...
@@ -151,7 +188,7 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
lastFrom
=
from
;
lastFrom
=
from
;
lastTo
=
to
;
lastTo
=
to
;
last
=
true
;
last
=
true
;
updateButtonsState
();
};
};
dom
.
addEventListener
(
'scroll'
,
Store
.
debounce
(
function
()
{
dom
.
addEventListener
(
'scroll'
,
Store
.
debounce
(
function
()
{
...
@@ -166,6 +203,19 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
...
@@ -166,6 +203,19 @@ const CardSlider = D.declare('view.cmp.CardSlider', (cfg) => {
});
});
tmpStore
.
sub
(
'width'
,
Store
.
debounce
(
function
(
w
)
{
let
firstItem
=
Math
.
round
(
dom
.
scrollLeft
/
(
cardWidth
+
padding
));
update
();
dom
.
scrollLeft
=
firstItem
*
(
cardWidth
+
padding
);
},
30
));
tmpStore
.
sub
(
'isMobile'
,
function
(
is
)
{
mobile
=
is
;
paddingLeft
=
paddingRight
=
is
?
10
:
30
;
update
();
});
return
theDOM
;
return
theDOM
;
});
});
...
...
src/view/cmp/cardSlider/CardSlider.scss
View file @
2b93f563
...
@@ -14,3 +14,6 @@
...
@@ -14,3 +14,6 @@
flex-direction
:
column
;
flex-direction
:
column
;
margin-bottom
:
30px
;
margin-bottom
:
30px
;
}
}
.card-slider__control-disabled
{
display
:
none
;
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment