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

Jump to bottom

[APM] Removes react-sticky dependency in favor of using CSS #84589

Merged
merged 2 commits into from
Dec 3, 2020
Merged

[APM] Removes react-sticky dependency in favor of using CSS #84589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d345a6d
[APM] Removes react-sticky dependency in favor of using CSS
Nov 30, 2020
380ba7c
Merge branch 'master' into rm-react-sticky
kibanamachine Dec 2, 2020
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
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@
"@types/react-resize-detector": "^4.0.1",
"@types/react-router": "^5.1.7",
"@types/react-router-dom": "^5.1.5",
"@types/react-sticky": "^6.0.3",
"@types/react-test-renderer": "^16.9.1",
"@types/react-virtualized": "^9.18.7",
"@types/read-pkg": "^4.0.0",
Expand Down Expand Up @@ -782,7 +781,6 @@
"react-router-redux": "^4.0.8",
"react-shortcuts": "^2.0.0",
"react-sizeme": "^2.3.6",
"react-sticky": "^6.0.3",
"react-syntax-highlighter": "^5.7.0",
"react-test-renderer": "^16.12.0",
"react-tiny-virtual-list": "^2.2.0",
Expand Down
5 changes: 2 additions & 3 deletions ...nents/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { i18n } from '@kbn/i18n';
import { History, Location } from 'history';
import React, { useState } from 'react';
import { useHistory } from 'react-router-dom';
import { StickyContainer } from 'react-sticky';
import styled from 'styled-components';
import { px } from '../../../../../../style/variables';
import { Timeline } from '../../../../../shared/charts/Timeline';
Expand Down Expand Up @@ -128,7 +127,7 @@ export function Waterfall({
})}
/>
)}
<StickyContainer>
<div>
<div style={{ display: 'flex' }}>
<EuiButtonEmpty
style={{ zIndex: 3, position: 'absolute' }}
Expand All @@ -147,7 +146,7 @@ export function Waterfall({
<WaterfallItemsContainer paddingTop={TIMELINE_MARGINS.top}>
{renderItems(waterfall.childrenByParentId)}
</WaterfallItemsContainer>
</StickyContainer>
</div>

<WaterfallFlyout
waterfallItemId={waterfallItemId}
Expand Down
14 changes: 2 additions & 12 deletions x-pack/plugins/apm/public/components/shared/charts/Timeline/Timeline.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

import React from 'react';
import { StickyContainer } from 'react-sticky';
import {
disableConsoleWarning,
mountWithTheme,
Expand Down Expand Up @@ -61,11 +60,7 @@ describe('Timeline', () => {
],
};

const wrapper = mountWithTheme(
<StickyContainer>
<Timeline {...props} />
</StickyContainer>
);
const wrapper = mountWithTheme(<Timeline {...props} />);

expect(toJson(wrapper)).toMatchSnapshot();
});
Expand All @@ -84,12 +79,7 @@ describe('Timeline', () => {
},
};

const mountTimeline = () =>
mountWithTheme(
<StickyContainer>
<Timeline {...props} />
</StickyContainer>
);
const mountTimeline = () => mountWithTheme(<Timeline {...props} />);

expect(mountTimeline).not.toThrow();
});
Expand Down
95 changes: 44 additions & 51 deletions x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import React, { ReactNode } from 'react';
import { inRange } from 'lodash';
import { Sticky } from 'react-sticky';
import { XAxis, XYPlot } from 'react-vis';
import { getDurationFormatter } from '../../../../../common/utils/formatters';
import { useTheme } from '../../../../hooks/use_theme';
Expand Down Expand Up @@ -54,57 +53,51 @@ export function TimelineAxis({
const topTraceDurationFormatted = tickFormatter(topTraceDuration).formatted;

return (
<Sticky disableCompensation>
{({ style }) => {
return (
<div
style={{
position: 'absolute',
borderBottom: `1px solid ${theme.eui.euiColorMediumShade}`,
height: px(margins.top),
zIndex: 2,
width: '100%',
...style,
}}
>
<XYPlot
dontCheckIfEmpty
width={width}
height={margins.top}
margin={{
top: margins.top,
left: margins.left,
right: margins.right,
}}
xDomain={xDomain}
>
<XAxis
hideLine
orientation="top"
tickSize={0}
tickValues={xAxisTickValues}
tickFormat={(time?: number) => tickFormatter(time).formatted}
tickPadding={20}
style={{
text: { fill: theme.eui.euiColorDarkShade },
}}
/>
<div
style={{
position: 'sticky',
top: 0,
borderBottom: `1px solid ${theme.eui.euiColorMediumShade}`,
height: px(margins.top),
zIndex: 2,
width: '100%',
}}
>
<XYPlot
dontCheckIfEmpty
width={width}
height={margins.top}
margin={{
top: margins.top,
left: margins.left,
right: margins.right,
}}
xDomain={xDomain}
>
<XAxis
hideLine
orientation="top"
tickSize={0}
tickValues={xAxisTickValues}
tickFormat={(time?: number) => tickFormatter(time).formatted}
tickPadding={20}
style={{
text: { fill: theme.eui.euiColorDarkShade },
}}
/>

{topTraceDuration > 0 && (
<LastTickValue
x={xScale(topTraceDuration)}
value={topTraceDurationFormatted}
marginTop={28}
/>
)}
{topTraceDuration > 0 && (
<LastTickValue
x={xScale(topTraceDuration)}
value={topTraceDurationFormatted}
marginTop={28}
/>
)}

{marks.map((mark) => (
<Marker key={mark.id} mark={mark} x={xScale(mark.offset)} />
))}
</XYPlot>
</div>
);
}}
</Sticky>
{marks.map((mark) => (
<Marker key={mark.id} mark={mark} x={xScale(mark.offset)} />
))}
</XYPlot>
</div>
);
}
19 changes: 6 additions & 13 deletions ...plugins/apm/public/components/shared/charts/Timeline/__snapshots__/Timeline.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 1 addition & 16 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5537,13 +5537,6 @@
"@types/history" "*"
"@types/react" "*"

"@types/react-sticky@^6.0.3":
version "6.0.3"
resolved "https://registry.yarnpkg.com/@types/react-sticky/-/react-sticky-6.0.3.tgz#94d16a951467b29ad44c224081d9503e7e590434"
integrity sha512-tW0Y1hTr2Tao4yX58iKl0i7BaqrdObGXAzsyzd8VGVrWVEgbQuV6P6QKVd/kFC7FroXyelftiVNJ09pnfkcjww==
dependencies:
"@types/react" "*"

"@types/react-syntax-highlighter@11.0.4":
version "11.0.4"
resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"
Expand Down Expand Up @@ -22892,7 +22885,7 @@ raf-schd@^4.0.0, raf-schd@^4.0.2:
resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.2.tgz#bd44c708188f2e84c810bf55fcea9231bcaed8a0"
integrity sha512-VhlMZmGy6A6hrkJWHLNTGl5gtgMUm+xfGza6wbwnE914yeQ5Ybm18vgM734RZhMgfw4tacUrWseGZlpUrrakEQ==

raf@^3.1.0, raf@^3.3.0, raf@^3.4.1:
raf@^3.1.0, raf@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
Expand Down Expand Up @@ -23570,14 +23563,6 @@ react-sizeme@^2.6.7:
shallowequal "^1.1.0"
throttle-debounce "^2.1.0"

react-sticky@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/react-sticky/-/react-sticky-6.0.3.tgz#7a18b643e1863da113d7f7036118d2a75d9ecde4"
integrity sha512-LNH4UJlRatOqo29/VHxDZOf6fwbgfgcHO4mkEFvrie5FuaZCSTGtug5R8NGqJ0kSnX8gHw8qZN37FcvnFBJpTQ==
dependencies:
prop-types "^15.5.8"
raf "^3.3.0"

react-style-singleton@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.1.0.tgz#7396885332e9729957f9df51f08cadbfc164e1c4"
Expand Down