[11907] Added detecting top scroll on Dashboard header (#12953)

This commit is contained in:
Kasia Kucharczyk 2021-02-04 22:22:16 +01:00 committed by GitHub
parent 2eff8608f1
commit 973306461c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 2 deletions

View File

@ -18,6 +18,7 @@
*/
import { throttle } from 'lodash';
import getDropPosition from '../../util/getDropPosition';
import handleScroll from './handleScroll';
const HOVER_THROTTLE_MS = 100;
@ -27,7 +28,9 @@ function handleHover(props, monitor, Component) {
const dropPosition = getDropPosition(monitor, Component);
if (!dropPosition) {
handleScroll(dropPosition);
if (!dropPosition || dropPosition === 'SCROLL_TOP') {
Component.setState(() => ({ dropIndicator: null }));
return;
}

View File

@ -0,0 +1,42 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
let scrollTopDashboardInterval: any;
const SCROLL_STEP = 120;
const INTERVAL_DELAY = 50;
export default function handleScroll(dropPosition: string) {
if (dropPosition === 'SCROLL_TOP') {
if (!scrollTopDashboardInterval) {
scrollTopDashboardInterval = setInterval(() => {
let scrollTop = document.documentElement.scrollTop - SCROLL_STEP;
if (scrollTop < 0) {
scrollTop = 0;
}
window.scroll({
top: scrollTop,
behavior: 'smooth',
});
}, INTERVAL_DELAY);
}
}
if (dropPosition !== 'SCROLL_TOP' && scrollTopDashboardInterval) {
clearInterval(scrollTopDashboardInterval);
scrollTopDashboardInterval = null;
}
}

View File

@ -17,12 +17,13 @@
* under the License.
*/
import isValidChild from './isValidChild';
import { TAB_TYPE, TABS_TYPE } from './componentTypes';
import { DASHBOARD_ROOT_TYPE, TAB_TYPE, TABS_TYPE } from './componentTypes';
export const DROP_TOP = 'DROP_TOP';
export const DROP_RIGHT = 'DROP_RIGHT';
export const DROP_BOTTOM = 'DROP_BOTTOM';
export const DROP_LEFT = 'DROP_LEFT';
export const SCROLL_TOP = 'SCROLL_TOP';
// this defines how close the mouse must be to the edge of a component to display
// a sibling type drop indicator
@ -54,6 +55,10 @@ export default function getDropPosition(monitor, Component) {
return null;
}
if (component.type === DASHBOARD_ROOT_TYPE) {
return SCROLL_TOP;
}
// TODO need a better solution to prevent nested tabs
if (
draggingItem.type === TABS_TYPE &&