Review fixes and updated docs

Semantic-Org · Feb 1, 2018 · f88dbee · f88dbee
1 parent 31d946c
commit f88dbee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/docs/app/Examples/modules/Popup/Variations/PopupExampleOffset.js b/docs/app/Examples/modules/Popup/Variations/PopupExampleOffset.js
@@ -36,15 +36,15 @@ const PopupExampleOffset = () => (
         <Popup
           trigger={<Icon name='heart' size='large' circular />}
           content='I am positioned to the left center but, I am now way off to the left if I fit in viewport'
-          horizontalOffset={400}
+          horizontalOffset={100}
           position='left center'
         />
       </Grid.Column>
       <Grid.Column floated='right' textAlign='right'>
         <Popup
           trigger={<Icon name='heart' size='large' circular />}
           content='I am positioned to the right center but, I am now way off to right if I fit in viewport'
-          horizontalOffset={400}
+          horizontalOffset={100}
           position='right center'
         />
       </Grid.Column>
@@ -55,15 +55,15 @@ const PopupExampleOffset = () => (
           trigger={<Icon name='heart' size='large' circular />}
           content='I am positioned to the bottom left but, I am now way off to bottom and left if I fit in viewport'
           horizontalOffset={100}
-          verticalOffset={100}
+          verticalOffset={-100}
           position='bottom left'
         />
       </Grid.Column>
       <Grid.Column textAlign='center'>
         <Popup
           trigger={<Icon name='heart' size='large' circular />}
           content='I am positioned to the bottom center but, I am now way off to the bottom if I fit in viewport'
-          verticalOffset={100}
+          verticalOffset={-100}
           position='bottom center'
         />
       </Grid.Column>
@@ -72,7 +72,7 @@ const PopupExampleOffset = () => (
           trigger={<Icon name='heart' size='large' circular />}
           content='I am positioned to the bottom right but, I am now way off to bottom and right if I fit in viewport'
           horizontalOffset={100}
-          verticalOffset={100}
+          verticalOffset={-100}
           position='bottom right'
         />
       </Grid.Column>

diff --git a/src/modules/Popup/Popup.js b/src/modules/Popup/Popup.js
@@ -204,13 +204,13 @@ export default class Popup extends Component {
   }
 
   applyVeriticalOffset = ({ top, bottom }, offset) => {
-    if (_.isNumber(top)) return { bottom, top: top + offset }
+    if (_.isNumber(top)) return { bottom, top: top - offset }
     return { top, bottom: bottom + offset }
   }
 
   applyHorizontalOffset = ({ right, left }, offset) => {
-    if (_.isNumber(right)) return { left, right: right + offset }
-    return { right, left: left + offset }
+    if (_.isNumber(right)) return { left, right: right - offset }
+    return { right, left: left - offset }
   }
 
   // check if the style would display

diff --git a/test/specs/modules/Popup/Popup-test.js b/test/specs/modules/Popup/Popup-test.js
@@ -83,7 +83,7 @@ describe('Popup', () => {
     it('accepts an offset to the left', () => {
       wrapperMount(
         <Popup
-          horizontalOffset={1000}
+          horizontalOffset={-1000}
           position='bottom left'
           content='foo'
           trigger={<button>foo</button>}
@@ -101,7 +101,7 @@ describe('Popup', () => {
     it('accepts an offset to the left', () => {
       wrapperMount(
         <Popup
-          horizontalOffset={1000}
+          horizontalOffset={-1000}
           verticalOffset={0}
           position='bottom left'
           content='foo'
@@ -121,7 +121,7 @@ describe('Popup', () => {
       wrapperMount(
         <Popup
           horizontalOffset={0}
-          verticalOffset={1000}
+          verticalOffset={-1000}
           position='bottom left'
           content='foo'
           trigger={<button>foo</button>}
@@ -139,8 +139,8 @@ describe('Popup', () => {
     it('accepts an offset to both top and left', () => {
       wrapperMount(
         <Popup
-          horizontalOffset={1000}
-          verticalOffset={1000}
+          horizontalOffset={-1000}
+          verticalOffset={-1000}
           position='bottom left'
           content='foo'
           trigger={<button>foo</button>}