Revert changes in margin modifiers typings

Author: ethanshar

demo/src/screens/componentScreens/CardsScreen.tsx

@@ -160,7 +160,9 @@ export default class CardsScreen extends Component<CardsScreenProps, CardsScreen
   renderCoupons = () => {
     return (
       <View row spread marginB-10>
+        {/* @ts-expect-error */}
         {this.renderCoupon({'marginR-10': true})}
+        {/* @ts-expect-error */}
         {this.renderCoupon({'marginL-10': true})}
       </View>
     );
@@ -185,6 +187,7 @@ export default class CardsScreen extends Component<CardsScreenProps, CardsScreen
       <View row spread height={160}>
         {
           // Icon
+          // @ts-expect-error
           this.renderComplexImage({'marginR-5': true},
             <Card.Section
               flex
@@ -202,6 +205,7 @@ export default class CardsScreen extends Component<CardsScreenProps, CardsScreen
         }
         {
           // Image with overlay content
+          // @ts-expect-error
           this.renderComplexImage({'marginL-5': true},
             <Card.Section
               flex

demo/src/screens/componentScreens/GridViewScreen.tsx

@@ -53,7 +53,7 @@ class GridViewScreen extends Component {
           descriptionLines: 2,
           alignToStart: true,
           onPress: () => Alert.alert('My price was ' + product.formattedPrice + ', now it is $50')
-        })))(products),
+        })))(products) as GridViewProps['items'],
     dynamicLayout: _.flow(products => _.take(products, 3),
       (products: any[]) =>
         _.map(products, product => ({

src/commons/modifiers.ts

@@ -102,8 +102,9 @@ export type BackgroundColorModifier = Modifier<'bg'>;
 export type AlignmentModifiers = Modifier<AlignmentLiterals>;
 export type PositionModifiers = Modifier<PositionLiterals>;
 export type PaddingModifiers = Modifier<PaddingLiterals>;
-// export type MarginModifiers = Modifier<MarginLiterals>;
-export type MarginModifiers = {[key: `${MarginLiterals}-${number}`]: boolean};
+export type MarginModifiers = Modifier<MarginLiterals>;
+// TODO: This caused issue with with some typings that inherit this type
+// export type MarginModifiers = Partial<{[key: `${MarginLiterals}-${number}`]: boolean}>;
 export type FlexModifiers = Modifier<FlexLiterals>;
 export type BorderRadiusModifiers = Modifier<BorderRadiusLiterals>;
 

src/components/picker/index.tsx

@@ -288,7 +288,6 @@ const Picker = React.forwardRef((props: PickerProps, ref) => {
           // @ts-expect-error - hopefully will be solved after the picker migration ends
           renderPicker(value, label)
         ) : (
-          // @ts-expect-error
           <TextFieldMigrator
             migrate={migrateTextField}
             // customWarning="RNUILib Picker component's internal TextField will soon be replaced with a new implementation, in order to start the migration - please pass to Picker the 'migrateTextField' prop"