diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json index 021afd6575..712a9db375 100644 --- a/packages/jaeger-ui/package.json +++ b/packages/jaeger-ui/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@jaegertracing/plexus": "0.0.1-dev.3", - "antd": "^3.0.3", + "antd": "3.8.0", "chance": "^1.0.10", "classnames": "^2.2.5", "combokeys": "^3.0.0", diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js index ead13feacb..2333a2d4cd 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js @@ -391,10 +391,11 @@ export default class ListView extends React.Component { const { dataLength, getKeyFromIndex, initialDraw, itemRenderer, viewBuffer, viewBufferMin } = this.props; const heightGetter = this._getHeight; const items = []; - let start; let end; + this._yPositions.profileData(dataLength); + if (!this._wrapperElm) { start = 0; end = (initialDraw < dataLength ? initialDraw : dataLength) - 1; @@ -417,7 +418,6 @@ export default class ListView extends React.Component { } } - this._yPositions.profileData(dataLength); this._yPositions.calcHeights(end, heightGetter, start || -1); this._startIndexDrawn = start; this._endIndexDrawn = end; diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.css b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.css index 6be2e0d87a..c5e0db9792 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.css +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.css @@ -15,9 +15,14 @@ limitations under the License. */ .TimelineCollapser { - float: right; - margin: 0 0.8rem 0 0; - display: inline-block; + align-items: center; + display: flex; + flex: none; + justify-content: center; +} + +.TimelineCollapser--tooltipTitle { + white-space: pre; } .TimelineCollapser--btn, diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.js index 2e905d72d5..1e954488ce 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.js +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.js @@ -15,7 +15,6 @@ // limitations under the License. import React from 'react'; - import { Tooltip, Icon } from 'antd'; import './TimelineCollapser.css'; @@ -27,22 +26,38 @@ type CollapserProps = { onExpandAll: () => void, }; -export default function TimelineCollapser(props: CollapserProps) { - const { onExpandAll, onExpandOne, onCollapseAll, onCollapseOne } = props; - return ( - - - - - - - - - - - - - - - ); +function getTitle(value: string) { + return {value}; +} + +export default class TimelineCollapser extends React.PureComponent { + props: CollapserProps; + containerRef: { current: HTMLDivElement | null }; + + constructor(props: CollapserProps) { + super(props); + this.containerRef = React.createRef(); + } + + getContainer = () => this.containerRef.current; + + render() { + const { onExpandAll, onExpandOne, onCollapseAll, onCollapseOne } = this.props; + return ( +
+ + + + + + + + + + + + +
+ ); + } } diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.css b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.css index 45eb9c5c2d..da1281ac0c 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.css +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.css @@ -19,16 +19,15 @@ limitations under the License. border-bottom: 1px solid #d8d8d8; height: 38px; line-height: 38px; - overflow: hidden; position: fixed; width: 100%; - z-index: 2; + z-index: 4; } .TimelineHeaderRow--title { - display: inline-block; + flex: 1; overflow: hidden; - margin: 0 0 0 0.5rem; + margin: 0; text-overflow: ellipsis; white-space: nowrap; } diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.js index 9c0a1e922a..053ed052af 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.js +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.js @@ -56,7 +56,7 @@ export default function TimelineHeaderRow(props: TimelineHeaderRowProps) { const [viewStart, viewEnd] = viewRangeTime.current; return ( - +

Service & Operation

?Set) = (textFilter: string) => { + filterSpans = (textFilter: string) => { const spans = this.props.trace && this.props.trace.data && this.props.trace.data.spans; if (!spans) return null; @@ -258,7 +258,9 @@ export class TracePageImpl extends React.PureComponent isTextInKeyValues(log.fields)) || isTextInKeyValues(span.process.tags); - return new Set(spans.filter(isSpanAMatch).map((span: Span) => span.spanID)); + // declare as const because need to disambiguate the type + const rv: Set = new Set(spans.filter(isSpanAMatch).map((span: Span) => span.spanID)); + return rv; }; updateTextFilter = (textFilter: string) => { diff --git a/yarn.lock b/yarn.lock index 7a352df0a2..ededcf7ff6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,4 +1,3 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. # yarn lockfile v1 @@ -253,52 +252,58 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -antd@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/antd/-/antd-3.0.3.tgz#ba9519fb8f6fa45b54b248b6139381ff83d5f382" +antd@3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/antd/-/antd-3.8.0.tgz#a4226a373fc301b9475b7d23e85433d203481858" dependencies: array-tree-filter "^2.0.0" babel-runtime "6.x" classnames "~2.2.0" create-react-class "^15.6.0" + create-react-context "^0.2.2" css-animation "^1.2.5" dom-closest "^0.2.0" enquire.js "^2.1.1" - lodash.debounce "^4.0.8" + intersperse "^1.0.0" + lodash "^4.17.5" moment "^2.19.3" omit.js "^1.0.0" prop-types "^15.5.7" + raf "^3.4.0" rc-animate "^2.4.1" - rc-calendar "~9.3.0" - rc-cascader "~0.12.0" - rc-checkbox "~2.1.1" - rc-collapse "~1.7.5" - rc-dialog "~7.0.3" - rc-dropdown "~2.1.0" + rc-calendar "~9.6.0" + rc-cascader "~0.14.0" + rc-checkbox "~2.1.5" + rc-collapse "~1.9.0" + rc-dialog "~7.2.0" + rc-drawer "~1.6.2" + rc-dropdown "~2.2.0" rc-editor-mention "^1.0.2" rc-form "^2.1.0" rc-input-number "~4.0.0" - rc-menu "~6.2.0" - rc-notification "~3.0.0" - rc-pagination "~1.12.4" + rc-menu "~7.0.2" + rc-notification "~3.2.0" + rc-pagination "~1.16.1" rc-progress "~2.2.2" - rc-rate "~2.3.0" - rc-select "~7.3.2" - rc-slider "~8.5.0" - rc-steps "~3.0.0" + rc-rate "~2.4.0" + rc-select "~8.1.1" + rc-slider "~8.6.0" + rc-steps "~3.1.0" rc-switch "~1.6.0" - rc-table "~6.1.0" - rc-tabs "~9.1.2" - rc-time-picker "~3.2.1" + rc-table "~6.2.0" + rc-tabs "~9.3.3" + rc-time-picker "~3.3.0" rc-tooltip "~3.7.0" - rc-tree "~1.7.0" - rc-tree-select "~1.12.0" - rc-upload "~2.4.0" + rc-tree "~1.13.0" + rc-tree-select "~2.0.5" + rc-trigger "^2.5.4" + rc-upload "~2.5.0" rc-util "^4.0.4" react-lazy-load "^3.0.12" - react-slick "~0.16.0" + react-lifecycles-compat "^3.0.2" + react-slick "~0.23.1" shallowequal "^1.0.1" - warning "~3.0.0" + warning "~4.0.1" any-observable@^0.2.0: version "0.2.0" @@ -1988,10 +1993,6 @@ camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" -can-use-dom@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a" - caniuse-api@^1.5.2: version "1.6.1" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c" @@ -2167,6 +2168,10 @@ classnames@2.x, classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classna version "2.2.5" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" +classnames@^2.2.6: + version "2.2.6" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" + clean-css@4.1.x: version "4.1.9" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.9.tgz#35cee8ae7687a49b98034f70de00c4edd3826301" @@ -2797,6 +2802,13 @@ create-react-class@^15.5.2: loose-envify "^1.3.1" object-assign "^4.1.1" +create-react-context@^0.2.2: + version "0.2.3" + resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3" + dependencies: + fbjs "^0.8.0" + gud "^1.0.0" + cross-spawn@5.1.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -3489,6 +3501,10 @@ dom-align@1.x: version "1.6.6" resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.6.6.tgz#cceef0e30a07e7036aa6d00d1297a2fd91c3a091" +dom-align@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.8.0.tgz#c0e89b5b674c6e836cd248c52c2992135f093654" + dom-closest@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-closest/-/dom-closest-0.2.0.tgz#ebd9f91d1bf22e8d6f477876bbcd3ec90216c0cf" @@ -4592,6 +4608,18 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" +fbjs@^0.8.0: + version "0.8.17" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" + dependencies: + core-js "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.9: version "0.8.14" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c" @@ -4900,14 +4928,6 @@ fs-extra@^1.0.0: jsonfile "^2.1.0" klaw "^1.0.0" -fs-extra@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - fs-extra@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -5276,6 +5296,10 @@ growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" +gud@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" + gzip-size@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520" @@ -5855,6 +5879,10 @@ interpret@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" +intersperse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/intersperse/-/intersperse-1.0.0.tgz#f2561fb1cfef9f5277cc3347a22886b4351a5181" + invariant@^2.0.0, invariant@^2.2.1, invariant@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" @@ -6073,6 +6101,10 @@ is-my-json-valid@^2.12.4: jsonpointer "^4.0.0" xtend "^4.0.0" +is-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" @@ -7562,10 +7594,6 @@ lodash.flattendeep@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -7605,10 +7633,6 @@ lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" -lodash.merge@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5" - lodash.reduce@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" @@ -8004,6 +8028,15 @@ mini-store@^1.0.2: prop-types "^15.6.0" shallowequal "^1.0.2" +mini-store@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/mini-store/-/mini-store-1.1.2.tgz#cc150e0878e080ca58219d47fccefefe2c9aea3e" + dependencies: + hoist-non-react-statics "^2.3.1" + prop-types "^15.6.0" + react-lifecycles-compat "^3.0.4" + shallowequal "^1.0.2" + minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" @@ -8591,7 +8624,7 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@4.1.1, object-assign@4.x, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1, object-assign@~4.1.0: +object-assign@4.1.1, object-assign@4.x, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -9543,6 +9576,13 @@ prop-types@15.x, prop-types@^15.5.7, prop-types@^15.6.0: loose-envify "^1.3.1" object-assign "^4.1.1" +prop-types@^15.5.0: + version "15.6.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" + dependencies: + loose-envify "^1.3.1" + object-assign "^4.1.1" + prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9: version "15.5.10" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" @@ -9757,7 +9797,16 @@ rc-align@2.x: prop-types "^15.5.8" rc-util "^4.0.4" -rc-animate@2.x, rc-animate@^2.0.2, rc-animate@^2.3.0, rc-animate@^2.4.1: +rc-align@^2.4.0, rc-align@^2.4.1: + version "2.4.3" + resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-2.4.3.tgz#b9b3c2a6d68adae71a8e1d041cd5e3b2a655f99a" + dependencies: + babel-runtime "^6.26.0" + dom-align "^1.7.0" + prop-types "^15.5.8" + rc-util "^4.0.4" + +rc-animate@2.x, rc-animate@^2.3.0, rc-animate@^2.4.1: version "2.4.3" resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.4.3.tgz#2440011d6fcaeedb0ee2db068c2c5676aa076559" dependencies: @@ -9765,9 +9814,22 @@ rc-animate@2.x, rc-animate@^2.0.2, rc-animate@^2.3.0, rc-animate@^2.4.1: css-animation "^1.3.2" prop-types "15.x" -rc-calendar@~9.3.0: - version "9.3.2" - resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.3.2.tgz#18727ee1b24f31b19445ad1b6f54802c08ec0459" +rc-animate@^3.0.0-rc.1, rc-animate@^3.0.0-rc.4, rc-animate@^3.0.0-rc.5: + version "3.0.0-rc.6" + resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.0.0-rc.6.tgz#04288eefa118e0cae214536c8a903ffaac1bc3fb" + dependencies: + babel-runtime "6.x" + classnames "^2.2.5" + component-classes "^1.2.6" + fbjs "^0.8.16" + prop-types "15.x" + raf "^3.4.0" + rc-util "^4.5.0" + react-lifecycles-compat "^3.0.4" + +rc-calendar@~9.6.0: + version "9.6.2" + resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.6.2.tgz#c7309db41225f4b8c81d5a1dcbe46d8ce07b6aee" dependencies: babel-runtime "6.x" classnames "2.x" @@ -9777,51 +9839,60 @@ rc-calendar@~9.3.0: rc-trigger "^2.2.0" rc-util "^4.1.1" -rc-cascader@~0.12.0: - version "0.12.1" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.12.1.tgz#0148514a8dd747c2335527c172ea0cf44180f940" +rc-cascader@~0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.14.0.tgz#a956c99896f10883bf63d46fb894d0cb326842a4" dependencies: array-tree-filter "^1.0.0" prop-types "^15.5.8" rc-trigger "^2.2.0" rc-util "^4.0.4" shallow-equal "^1.0.0" + warning "^4.0.1" -rc-checkbox@~2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.1.tgz#7b2d3632285eaad9cad78612a6643d7d34589e72" +rc-checkbox@~2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.5.tgz#411858448c0ee2a797ef8544dac63bcaeef722ef" dependencies: babel-runtime "^6.23.0" classnames "2.x" prop-types "15.x" rc-util "^4.0.4" -rc-collapse@~1.7.5: - version "1.7.7" - resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.7.7.tgz#16c9fe691f0191f16c9c2eda39989bfc1a19fa2b" +rc-collapse@~1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-1.9.3.tgz#d9741db06a823353e1fd1aec3ba4c0f9d8af4b26" dependencies: classnames "2.x" css-animation "1.x" prop-types "^15.5.6" rc-animate "2.x" -rc-dialog@~7.0.3: - version "7.0.4" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.0.4.tgz#a883cb6ef47db406b883b436c1860df1c6c45e64" +rc-dialog@~7.2.0: + version "7.2.1" + resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.2.1.tgz#ac92fcffdf2a0eaa64b77f829336653d911a57be" dependencies: babel-runtime "6.x" - create-react-class "^15.5.2" - object-assign "~4.1.0" rc-animate "2.x" - rc-util "^4.1.0" + rc-util "^4.4.0" -rc-dropdown@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-2.1.0.tgz#ae39db67e593ef4ed889dee99ef13ae3994a5c7f" +rc-drawer@~1.6.2: + version "1.6.3" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-1.6.3.tgz#f866b7fbde2d307b59cfd06c015ae697017db388" + dependencies: + babel-runtime "6.x" + classnames "^2.2.5" + prop-types "^15.5.0" + rc-util "^4.5.1" + +rc-dropdown@~2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-2.2.1.tgz#172b6e87f0909fe8ab983e375f62e2866f3250c3" dependencies: babel-runtime "^6.26.0" prop-types "^15.5.8" - rc-trigger "^2.2.2" + rc-trigger "^2.5.1" + react-lifecycles-compat "^3.0.2" rc-editor-core@~0.8.1: version "0.8.3" @@ -9867,30 +9938,32 @@ rc-hammerjs@~0.6.0: prop-types "^15.5.9" rc-input-number@~4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.0.2.tgz#09651d5fc05c7f6a1e2111dbfad7ed5743fa7595" + version "4.0.13" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.0.13.tgz#18ac305bf07b6771ad0e4edc97b1e1bbb9b71918" dependencies: babel-runtime "6.x" classnames "^2.2.0" + is-negative-zero "^2.0.0" prop-types "^15.5.7" - rmc-feedback "^1.0.0" + rc-util "^4.5.1" + rmc-feedback "^2.0.0" -rc-menu@^6.1.0, rc-menu@~6.2.0: - version "6.2.4" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-6.2.4.tgz#5ee1b8202ffaa234d6f97e8cebd4a3ccf27f44da" +rc-menu@~7.0.2, rc-menu@~7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-7.0.5.tgz#986b65df5ad227aadf399ea374b98d2313802316" dependencies: babel-runtime "6.x" classnames "2.x" - create-react-class "^15.5.2" dom-scroll-into-view "1.x" + mini-store "^1.1.0" prop-types "^15.5.6" rc-animate "2.x" rc-trigger "^2.3.0" rc-util "^4.1.0" -rc-notification@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-3.0.0.tgz#cefbeb8a03052dc5b988a07f9ba31895e886ac2e" +rc-notification@~3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-3.2.0.tgz#bbfb6a92c4e54c9eeb7ac51a7e8c64011ea12ab1" dependencies: babel-runtime "6.x" classnames "2.x" @@ -9898,9 +9971,9 @@ rc-notification@~3.0.0: rc-animate "2.x" rc-util "^4.0.4" -rc-pagination@~1.12.4: - version "1.12.12" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.12.12.tgz#0609c7b32f43ae158b8d9093ffeec81e5d458d91" +rc-pagination@~1.16.1: + version "1.16.5" + resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.16.5.tgz#550a758035e1957ccfa2f71ee6e55657da729679" dependencies: babel-runtime "6.x" prop-types "^15.5.7" @@ -9912,33 +9985,35 @@ rc-progress@~2.2.2: babel-runtime "6.x" prop-types "^15.5.8" -rc-rate@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.3.0.tgz#abdaad4bb0a7d250cf8bde58dc84936ade2ba2cb" +rc-rate@~2.4.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.4.2.tgz#c097bfdba7a5783cec287c928b1461cc1621f836" dependencies: babel-runtime "^6.26.0" classnames "^2.2.5" prop-types "^15.5.8" rc-util "^4.3.0" -rc-select@~7.3.2: - version "7.3.3" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-7.3.3.tgz#e8294f149416a50b1511eb71ae0c2fbca0b4e5f6" +rc-select@~8.1.1: + version "8.1.2" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-8.1.2.tgz#b149d971eb42b6f0e61625d66a78391b0a888b6b" dependencies: babel-runtime "^6.23.0" classnames "2.x" component-classes "1.x" dom-scroll-into-view "1.x" prop-types "^15.5.8" + raf "^3.4.0" rc-animate "2.x" - rc-menu "^6.1.0" + rc-menu "~7.0.5" rc-trigger "^2.2.0" rc-util "^4.0.4" + react-lifecycles-compat "^3.0.2" warning "^3.0.0" -rc-slider@~8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.5.0.tgz#6fae97d8ba59a012af69a00409f21925b8954cf5" +rc-slider@~8.6.0: + version "8.6.3" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.6.3.tgz#1ca0e0bd2863252741de75e7bf8c9f2cfcffccb7" dependencies: babel-runtime "6.x" classnames "^2.2.5" @@ -9948,13 +10023,13 @@ rc-slider@~8.5.0: shallowequal "^1.0.1" warning "^3.0.0" -rc-steps@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.0.1.tgz#fa886eb93d223173ef9a05396f32186992549535" +rc-steps@~3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.1.1.tgz#79583ad808309d82b8e011676321d153fd7ca403" dependencies: babel-runtime "^6.23.0" classnames "^2.2.3" - lodash.debounce "^4.0.8" + lodash "^4.17.5" prop-types "^15.5.7" rc-switch@~1.6.0: @@ -9965,36 +10040,36 @@ rc-switch@~1.6.0: classnames "^2.2.1" prop-types "^15.5.6" -rc-table@~6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.1.1.tgz#638fd8746344f8272ccf120b6c4a5423bb8cac5f" +rc-table@~6.2.0: + version "6.2.9" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.2.9.tgz#d82b6f35f3052dd344e4e9821d92ee5d27620997" dependencies: babel-runtime "6.x" + classnames "^2.2.5" component-classes "^1.2.6" - lodash.get "^4.4.2" - lodash.merge "^4.6.0" + lodash "^4.17.5" mini-store "^1.0.2" prop-types "^15.5.8" rc-util "^4.0.4" + react-lifecycles-compat "^3.0.2" shallowequal "^1.0.2" warning "^3.0.0" -rc-tabs@~9.1.2: - version "9.1.11" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.1.11.tgz#cb259d312b4b238f4e5a90dc0efb88000d8e9535" +rc-tabs@~9.3.3: + version "9.3.6" + resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-9.3.6.tgz#873890b3a68164a5814f89e343270b1ce9eb6acd" dependencies: babel-runtime "6.x" classnames "2.x" - create-react-class "15.x" - lodash.debounce "^4.0.8" + lodash "^4.17.5" prop-types "15.x" rc-hammerjs "~0.6.0" rc-util "^4.0.4" warning "^3.0.0" -rc-time-picker@~3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.2.1.tgz#e105fed32814bb95f37dbc60b49495cd787abfa2" +rc-time-picker@~3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.3.1.tgz#94f8bbd51e6b93de1f01e78064aef1e6d765b367" dependencies: babel-runtime "6.x" classnames "2.x" @@ -10010,22 +10085,25 @@ rc-tooltip@^3.7.0, rc-tooltip@~3.7.0: prop-types "^15.5.8" rc-trigger "^2.2.2" -rc-tree-select@~1.12.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-1.12.3.tgz#7bde797bf8b5c54657ba0e1d0831df1fdb3cf505" +rc-tree-select@~2.0.5: + version "2.0.14" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-2.0.14.tgz#6b76c50f32ebe9aeb720f98ce36b43b3e8be11d2" dependencies: babel-runtime "^6.23.0" classnames "^2.2.1" - object-assign "^4.0.1" prop-types "^15.5.8" - rc-animate "^2.0.2" - rc-tree "~1.7.1" - rc-trigger "^2.2.2" - rc-util "^4.0.2" + raf "^3.4.0" + rc-animate "^3.0.0-rc.4" + rc-tree "~1.12.2" + rc-trigger "^3.0.0-rc.2" + rc-util "^4.5.0" + react-lifecycles-compat "^3.0.4" + shallowequal "^1.0.2" + warning "^4.0.1" -rc-tree@~1.7.0, rc-tree@~1.7.1: - version "1.7.10" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.7.10.tgz#8d93d73fa3a91ebf6dde4ebaa98e750a9c8fe154" +rc-tree@~1.12.2: + version "1.12.7" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.12.7.tgz#94ce4b59d27325c555d6238c7b92feeaa5d476a0" dependencies: babel-runtime "^6.23.0" classnames "2.x" @@ -10034,6 +10112,18 @@ rc-tree@~1.7.0, rc-tree@~1.7.1: rc-util "^4.0.4" warning "^3.0.0" +rc-tree@~1.13.0: + version "1.13.3" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-1.13.3.tgz#5932f1bc17bdc0a834d3e7cb98a1391ff78a8f28" + dependencies: + babel-runtime "^6.23.0" + classnames "2.x" + prop-types "^15.5.8" + rc-animate "^3.0.0-rc.5" + rc-util "^4.5.1" + react-lifecycles-compat "^3.0.4" + warning "^3.0.0" + rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0: version "2.3.3" resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.3.3.tgz#406c5ddea594aca71d067852f27d91a5f3a653b8" @@ -10045,16 +10135,39 @@ rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0: rc-animate "2.x" rc-util "^4.3.0" -rc-upload@~2.4.0: - version "2.4.4" - resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.4.4.tgz#28e1e6a3e44d1b1f92e57e21927cfa2763ac2a21" +rc-trigger@^2.5.1, rc-trigger@^2.5.4: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.6.2.tgz#a9c09ba5fad63af3b2ec46349c7db6cb46657001" + dependencies: + babel-runtime "6.x" + classnames "^2.2.6" + prop-types "15.x" + rc-align "^2.4.0" + rc-animate "2.x" + rc-util "^4.4.0" + +rc-trigger@^3.0.0-rc.2: + version "3.0.0-rc.3" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-3.0.0-rc.3.tgz#35842df1674d25315e1426a44882a4c97652258b" + dependencies: + babel-runtime "6.x" + classnames "^2.2.6" + prop-types "15.x" + raf "^3.4.0" + rc-align "^2.4.1" + rc-animate "^3.0.0-rc.1" + rc-util "^4.4.0" + +rc-upload@~2.5.0: + version "2.5.1" + resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-2.5.1.tgz#7ae0c9038d98ba8750e9466d8f969e1b4bc9f0e0" dependencies: babel-runtime "6.x" classnames "^2.2.5" prop-types "^15.5.7" warning "2.x" -rc-util@^4.0.2, rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0: +rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0: version "4.3.1" resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.3.1.tgz#79f0adb30f449c1b29d7c5cdb2d82c193920c362" dependencies: @@ -10063,6 +10176,15 @@ rc-util@^4.0.2, rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0: prop-types "^15.5.10" shallowequal "^0.2.2" +rc-util@^4.4.0, rc-util@^4.5.0, rc-util@^4.5.1: + version "4.5.1" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.5.1.tgz#0e435057174c024901c7600ba8903dd03da3ab39" + dependencies: + add-dom-event-listener "1.x" + babel-runtime "6.x" + prop-types "^15.5.10" + shallowequal "^0.2.2" + rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: version "1.2.4" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3" @@ -10173,6 +10295,10 @@ react-lazy-load@^3.0.12: lodash.throttle "^4.0.0" prop-types "^15.5.8" +react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + react-metrics@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/react-metrics/-/react-metrics-2.3.2.tgz#8952691279e91538ed9b94fca72384c361b7751c" @@ -10299,17 +10425,15 @@ react-side-effect@^1.1.0: exenv "^1.2.1" shallowequal "^1.0.1" -react-slick@~0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.16.0.tgz#27385fb88503d208be081d37267ddec961209a7b" +react-slick@~0.23.1: + version "0.23.1" + resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.23.1.tgz#15791c4107f0ba3a5688d5bd97b7b7ceaa0dd181" dependencies: - can-use-dom "^0.1.0" classnames "^2.2.5" - create-react-class "^15.5.2" enquire.js "^2.1.6" json2mq "^0.2.0" - object-assign "^4.1.0" - slick-carousel "^1.6.0" + lodash.debounce "^4.0.8" + resize-observer-polyfill "^1.5.0" react-test-renderer@^15.5.4, react-test-renderer@^15.6.1: version "15.6.1" @@ -10929,6 +11053,10 @@ reselect@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147" +resize-observer-polyfill@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69" + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -11011,9 +11139,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -rmc-feedback@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/rmc-feedback/-/rmc-feedback-1.0.3.tgz#efd9d75c51998857c7a9a495ee507313a81aaee9" +rmc-feedback@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/rmc-feedback/-/rmc-feedback-2.0.0.tgz#cbc6cb3ae63c7a635eef0e25e4fbaf5ac366eeaa" dependencies: babel-runtime "6.x" classnames "^2.2.5" @@ -11356,10 +11484,6 @@ slice-ansi@1.0.0: dependencies: is-fullwidth-code-point "^2.0.0" -slick-carousel@^1.6.0: - version "1.8.1" - resolved "https://registry.yarnpkg.com/slick-carousel/-/slick-carousel-1.8.1.tgz#a4bfb29014887bb66ce528b90bd0cda262cc8f8d" - slide@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" @@ -12296,6 +12420,10 @@ u-basscss@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/u-basscss/-/u-basscss-2.0.0.tgz#5a78c543f69641fca1b693714852a497a35d9b79" +ua-parser-js@^0.7.18: + version "0.7.18" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed" + ua-parser-js@^0.7.9: version "0.7.14" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca" @@ -12617,12 +12745,18 @@ warning@2.x: dependencies: loose-envify "^1.0.0" -warning@^3.0.0, warning@~3.0.0: +warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" dependencies: loose-envify "^1.0.0" +warning@^4.0.1, warning@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607" + dependencies: + loose-envify "^1.0.0" + watch@~0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"