Fix Tabs.tab option builder was missing CustomClass, Modifiers

Fulma · Aug 31, 2018 · d704f72 · d704f72
1 parent aa3745a
commit d704f72
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/src/Fulma/Components/Tabs.fs b/src/Fulma/Components/Tabs.fs
@@ -118,6 +118,9 @@ module Tabs =
             | Tab.Modifiers modifiers -> { result with Modifiers = modifiers |> Modifier.parseModifiers }
 
         let opts = options |> List.fold parseOptions Tab.Options.Empty
-        let classes = classList [ Classes.State.IsActive, opts.IsActive ] :> IHTMLProp
+        let classes = Helpers.classes
+                        ""
+                        ( opts.CustomClass::opts.Modifiers )
+                        [ Classes.State.IsActive, opts.IsActive ]
         li (classes::opts.Props)
             children
diff --git a/src/Fulma/Fulma.fsproj b/src/Fulma/Fulma.fsproj
@@ -8,7 +8,7 @@
     <RepositoryUrl>https://github.com/MangelMaxime/Fulma</RepositoryUrl>
     <PackageTags>fable;elm;fsharp;bulma</PackageTags>
     <Authors>Maxime Mangel</Authors>
-    <Version>1.0.0-beta-025</Version>
+    <Version>1.0.0-beta-026</Version>
   </PropertyGroup>
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>

diff --git a/src/Fulma/RELEASE_NOTES.md b/src/Fulma/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 1.0.0-beta-026
+
+- Fix Tabs.tab option builder. `CustomClass` and `Modifiers` wasn't added to the generated classes
+
 ### 1.0.0-beta-025
 
 - BREAKING CHANGE: `Menu.item` has been replaced with `Menu.Item.a` and `Menu.Item.li`

diff --git a/templates/Content/.gitignore b/templates/Content/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 packages/
 paket-files/
 paket.local

diff --git a/templates/Content/.paket/Paket.Restore.targets b/templates/Content/.paket/Paket.Restore.targets
@@ -72,6 +72,9 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
+      <PaketRestoreRequired>true</PaketRestoreRequired>
+    </PropertyGroup>
 
     <!-- Do a global restore if required -->
     <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
@@ -93,7 +96,7 @@
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
       <!-- paket.references -->
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
-      
+
       <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
       <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
       <PaketRestoreRequired>true</PaketRestoreRequired>
@@ -132,11 +135,11 @@
     <Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
 
     <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
-    <ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"-->
+    <ReadLinesFromFile Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" >
       <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
     </ReadLinesFromFile>
 
-    <ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
+    <ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " >
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>