Skip to content

Commit

Permalink
Merge pull request #309 from veritone/sdo-integration-changes-to-master
Browse files Browse the repository at this point in the history
Sdo integration changes to master
  • Loading branch information
olslash committed Jan 24, 2019
2 parents 0542fa7 + ff75b15 commit 5570ea0
Show file tree
Hide file tree
Showing 91 changed files with 467 additions and 6,484 deletions.
Expand Up @@ -400,7 +400,9 @@ export default class Overlay extends React.Component {
isString(this.state.focusedBoundingBoxId) &&
!this.state.userActingOnBoundingBox &&
!this.state.userMinimizedConfirmMenu &&
this.state.boundingBoxPositions.some(el => el.id === this.state.focusedBoundingBoxId);
this.state.boundingBoxPositions.some(
el => el.id === this.state.focusedBoundingBoxId
);

const boundingBoxCommonStyles = {
// this seems to fix some rendering jank
Expand Down
@@ -1,5 +1,5 @@
import React from 'react';
import { node, number, bool } from 'prop-types';
import { node, number, bool, string } from 'prop-types';
import { isEqual } from 'lodash';
import cx from 'classnames';
import styles from './overlayPositioningProvider.styles.scss';
Expand All @@ -15,7 +15,8 @@ export default class OverlayPositioningProvider extends React.Component {
contentHeight: number.isRequired,
contentWidth: number.isRequired,
fixedWidth: bool,
children: node
children: node,
contentClassName: string
};
static defaultProps = {};

Expand Down Expand Up @@ -97,6 +98,7 @@ export default class OverlayPositioningProvider extends React.Component {
<OverlayPositioningContext.Provider value={this.state.overlayPosition}>
<div className={cx({ [styles.clearfix]: this.props.fixedWidth })}>
<div
className={cx(this.props.contentClassName)}
style={{
float: this.props.fixedWidth ? 'left' : 'none',
position: 'relative',
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 5570ea0

Please sign in to comment.