From 0a84ccb299b683f8994739f18a297c9e20f8295c Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Thu, 21 Sep 2017 14:13:48 -0700 Subject: [PATCH] [fix] IE10 flexbox support Add prefixes for flexbox (and other) support in IE10. Ref #650 --- scripts/createPrefixer.js | 2 +- .../__snapshots__/renderApplication-test.js.snap | 14 +++++++------- src/modules/prefixStyles/static.js | 11 +++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/scripts/createPrefixer.js b/scripts/createPrefixer.js index 131c736c..167f9420 100644 --- a/scripts/createPrefixer.js +++ b/scripts/createPrefixer.js @@ -7,7 +7,7 @@ const browserList = { firefox: 40, ios_saf: 7, safari: 7, - ie: 11, + ie: 10, ie_mob: 11, edge: 12, opera: 16, diff --git a/src/apis/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap b/src/apis/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap index 919385de..be9839c1 100644 --- a/src/apis/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap +++ b/src/apis/AppRegistry/__tests__/__snapshots__/renderApplication-test.js.snap @@ -38,7 +38,7 @@ exports[`apis/AppRegistry/renderApplication getApplication 3`] = ` .rn-textAlign-1ttztb7{text-align:inherit} .rn-textDecoration-bauka4{text-decoration:none} .rn-listStyle-1ebb2ja{list-style:none} -.rn-alignItems-1oszu61{-webkit-align-items:stretch;-webkit-box-align:stretch;align-items:stretch} +.rn-alignItems-1oszu61{-ms-flex-align:stretch;-webkit-align-items:stretch;-webkit-box-align:stretch;align-items:stretch} .rn-borderTopStyle-1efd50x{border-top-style:solid} .rn-borderRightStyle-14skgim{border-right-style:solid} .rn-borderBottomStyle-rull8r{border-bottom-style:solid} @@ -50,10 +50,10 @@ exports[`apis/AppRegistry/renderApplication getApplication 3`] = ` .rn-boxSizing-deolkf{box-sizing:border-box} .rn-display-6koalj{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex} .rn-display-xoduu5{display:-webkit-inline-box;display:-moz-inline-box;display:-ms-inline-flexbox;display:-webkit-inline-flex;display:inline-flex} -.rn-flexShrink-1pxmb3b{-webkit-flex-shrink:0 !important;flex-shrink:0 !important} -.rn-flexShrink-1awmn5t{-webkit-flex-shrink:1 !important;flex-shrink:1 !important} -.rn-flexBasis-7vfszb{-webkit-flex-basis:auto !important;flex-basis:auto !important} -.rn-flexDirection-eqz5dr{-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-direction:column;flex-direction:column} +.rn-flexShrink-1pxmb3b{-ms-flex-negative:0 !important;-webkit-flex-shrink:0 !important;flex-shrink:0 !important} +.rn-flexShrink-1awmn5t{-ms-flex-negative:1 !important;-webkit-flex-shrink:1 !important;flex-shrink:1 !important} +.rn-flexBasis-7vfszb{-ms-flex-preferred-size:auto !important;-webkit-flex-basis:auto !important;flex-basis:auto !important} +.rn-flexDirection-eqz5dr{-ms-flex-direction:column;-webkit-box-direction:normal;-webkit-box-orient:vertical;-webkit-flex-direction:column;flex-direction:column} .rn-marginTop-1mnahxq{margin-top:0px} .rn-marginRight-61z16t{margin-right:0px} .rn-marginBottom-p1pxzi{margin-bottom:0px} @@ -66,6 +66,6 @@ exports[`apis/AppRegistry/renderApplication getApplication 3`] = ` .rn-paddingLeft-gy4na3{padding-left:0px} .rn-zIndex-1lgpqti{z-index:0} .rn-zIndex-1wyyakw{z-index:-1} -.rn-flex-13awgt0{-webkit-flex:1;flex:1} -.rn-flexGrow-1m1wadx{-webkit-flex-grow:1 !important;flex-grow:1 !important}" +.rn-flex-13awgt0{-ms-flex:1;-webkit-flex:1;flex:1} +.rn-flexGrow-1m1wadx{-ms-flex-positive:1 !important;-webkit-flex-grow:1 !important;flex-grow:1 !important}" `; diff --git a/src/modules/prefixStyles/static.js b/src/modules/prefixStyles/static.js index 9ea0cecc..64d2a3fe 100644 --- a/src/modules/prefixStyles/static.js +++ b/src/modules/prefixStyles/static.js @@ -2,6 +2,7 @@ import crossFade from 'inline-style-prefixer/static/plugins/crossFade'; import cursor from 'inline-style-prefixer/static/plugins/cursor'; import filter from 'inline-style-prefixer/static/plugins/filter'; import flex from 'inline-style-prefixer/static/plugins/flex'; +import flexboxIE from 'inline-style-prefixer/static/plugins/flexboxIE'; import flexboxOld from 'inline-style-prefixer/static/plugins/flexboxOld'; import gradient from 'inline-style-prefixer/static/plugins/gradient'; import imageSet from 'inline-style-prefixer/static/plugins/imageSet'; @@ -21,6 +22,7 @@ export default { cursor, filter, flex, + flexboxIE, flexboxOld, gradient, imageSet, @@ -82,13 +84,13 @@ export default { columns: wm, columnSpan: wm, columnWidth: wm, - flex: w, + flex: wms, flexBasis: w, - flexDirection: w, + flexDirection: wms, flexGrow: w, - flexFlow: w, + flexFlow: wms, flexShrink: w, - flexWrap: w, + flexWrap: wms, alignContent: w, alignItems: w, alignSelf: w, @@ -122,6 +124,7 @@ export default { wrapFlow: ms, wrapThrough: ms, wrapMargin: ms, + touchAction: ms, gridTemplateColumns: ms, gridTemplateRows: ms, gridTemplateAreas: ms,