Sfoglia il codice sorgente

Export MeasuresType maker and result

Tatiana Inama 6 anni fa
parent
commit
1617092f8d

+ 1 - 1
recipes/src/components/Ingredient/Form/index.tsx

@@ -33,7 +33,7 @@ class IngredientForm extends React.Component<IngredientFormProps, IngredientForm
   constructor(props: IngredientFormProps) {
     super(props);
     this.state = {
-      unitOptions: MeasuresTypes().map(m => ({label: m, value: m})),
+      unitOptions: MeasuresTypes.map(m => ({label: m, value: m})),
       activeGroup: 0,
       normalizeUnits: {
         tablespoon: 'tbsp',

+ 1 - 2
recipes/src/components/RecipeForm/index.tsx

@@ -93,7 +93,6 @@ const FormikTextarea = ({ label, ...props }: FormikInputProps)  => {
 const RecipeForm = <T extends Recipe|DBRecipe>({ initialValues, onSubmit }: RecipeFormProps<T>) => {
   const [selectedTab, setSelectedTab] = useState(0);
   const [focusLast, setFocusLast] = useState(false);
-  const measurements = MeasuresTypes();
 
   return (
   <div>
@@ -243,7 +242,7 @@ const RecipeForm = <T extends Recipe|DBRecipe>({ initialValues, onSubmit }: Reci
                                           <Field component='select' name={`ingredients[${selectedTab}].ingredients[${index}].unit`}>
                                             <option value=''></option>
                                             {
-                                              measurements.map((measure, measureIdx) => (
+                                              MeasuresTypes.map((measure, measureIdx) => (
                                                 <option key={measureIdx} value={measure}>{measure}</option>    
                                               ))
                                             }

+ 4 - 1
recipes/src/services/measurements.ts

@@ -62,7 +62,7 @@ const measureValues: { [key:string]: string[] } = {
   temperature: ['C', 'F'],
 }
 
-const MeasuresTypes = (measure?: Measure) => {
+const GetMeasuresTypes = (measure?: Measure) => {
   return measure ?
   measureValues[measure] :
   [ ...measureValues.mass, ...measureValues.volume, ...measureValues.misc ]
@@ -77,7 +77,10 @@ const ParseUnit = (unit: string): Measure => {
   return 'mass';
 }
 
+const MeasuresTypes = GetMeasuresTypes();
+
 export {
+  GetMeasuresTypes,
   MeasuresTypes,
   Convert,
   ParseUnit,