github
/
hexo-theme-icarus
mirror of https://github.com/ppoffice/hexo-theme-icarus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(widget): no shadow right col if no right col

pull/588/head
ppoffice 2020-01-04 00:54:22 -05:00
parent 4b899bb38a
commit c0a4f7e335
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
layout/common/widgets.jsx
View File

@ -18,16 +18,15 @@ function formatWidgets(widgets) {
return result;
}
function hasColumn(widgets, position) {
if (Array.isArray(widgets)) {
return typeof widgets.find(widget => widget.position === position) !== 'undefined';
}
return false;
}
function getColumnCount(widgets) {
let count = 1;
const w = formatWidgets(widgets);
if ('left' in w && w.left.length) {
count++;
}
if ('right' in w && w.right.length) {
count++;
}
return count;
return [hasColumn(widgets, 'left'), hasColumn(widgets, 'right')].filter(v => !!v).length + 1;
}
function getColumnSizeClass(columnCount) {
@ -88,7 +87,7 @@ class Widgets extends Component {
}
return null;
})}
{position === 'left' ? <div class={classname({
{position === 'left' && hasColumn(config.widgets, 'right') ? <div class={classname({
'column-right-shadow': true,
'is-hidden-widescreen': true,
'is-sticky': isColumnSticky(config, 'right')