Skip to content

Commit

Permalink
Merge branch 'develop' into 8412-blazorui-missing-colors
Browse files Browse the repository at this point in the history
  • Loading branch information
msynk committed Sep 9, 2024
2 parents bf9f991 + 1e815eb commit fb67c22
Show file tree
Hide file tree
Showing 273 changed files with 7,340 additions and 4,303 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/admin-sample.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

- name: Configure app render mode
run: |
sed -i 's/Auto;/BlazorWebAssembly;/g' AdminPanel/src/Client/AdminPanel.Client.Core/Services/AppRenderMode.cs
sed -i 's/BlazorAuto;/BlazorWebAssembly;/g' AdminPanel/src/Client/AdminPanel.Client.Core/Services/AppRenderMode.cs
- name: Generate CSS/JS files
run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/todo-sample.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Configure app render mode
run: |
sed -i 's/public static readonly bool PrerenderEnabled = false;/public static readonly bool PrerenderEnabled = true;/g' TodoSample/src/Client/TodoSample.Client.Core/Services/AppRenderMode.cs
sed -i 's/Auto;/BlazorWebAssembly;/g' TodoSample/src/Client/TodoSample.Client.Core/Services/AppRenderMode.cs
sed -i 's/BlazorAuto;/BlazorWebAssembly;/g' TodoSample/src/Client/TodoSample.Client.Core/Services/AppRenderMode.cs
- name: Changes for static-todo.bitplatform.dev - Part 1
run: sed -i 's/http:\/\/localhost:4030/https:\/\/static-todo.bitplatform.dev/g' TodoSample/src/Server/TodoSample.Server.Web/Program.Middlewares.cs
Expand Down
2 changes: 1 addition & 1 deletion src/Besql/Bit.Besql/wwwroot/bit-besql.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var BitBesql = BitBesql || {};
BitBesql.version = window['bit-besql version'] = '8.11.0-pre-04';
BitBesql.version = window['bit-besql version'] = '8.11.0-pre-06';

async function synchronizeDbWithCache(file) {

Expand Down
4 changes: 2 additions & 2 deletions src/Bit.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<ReleaseVersion>8.11.0</ReleaseVersion>

<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)-pre-04</PackageReleaseNotes>
<PackageVersion>$(ReleaseVersion)-pre-04</PackageVersion>
<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)-pre-06</PackageReleaseNotes>
<PackageVersion>$(ReleaseVersion)-pre-06</PackageVersion>

<!-- Version -->
<Version Condition=" '$(Configuration)' == 'Release' ">$(ReleaseVersion).$([System.DateTime]::Now.ToString(HHmm))</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// <summary>
/// Represents the config for a bubble chart.
/// </summary>
public class BitChartBubbleConfig : BitChartConfigBase<BitChartBubbleOptions>
public class BitChartBubbleConfig : BitChartConfigBase<BitChartLineOptions>
{
/// <summary>
/// Creates a new instance of <see cref="BitChartBubbleConfig"/>.
Expand Down
9 changes: 5 additions & 4 deletions src/BlazorUI/Bit.BlazorUI.Extras/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/BlazorUI/Bit.BlazorUI.Extras/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devDependencies": {
"esbuild": "0.23.1",
"sass": "1.77.8",
"sass": "1.78.0",
"typescript": "5.5.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,31 +92,31 @@ public void BitOtpInputVerticalTest(bool vertical)
}

[DataTestMethod,
DataRow(BitOtpInputType.Text),
DataRow(BitOtpInputType.Number),
DataRow(BitOtpInputType.Password)
DataRow(BitInputType.Text),
DataRow(BitInputType.Number),
DataRow(BitInputType.Password)
]
public void BitOtpInputTypeTest(BitOtpInputType inputType)
public void BitInputTypeTest(BitInputType inputType)
{
var com = RenderComponent<BitOtpInput>(parameters =>
{
parameters.Add(p => p.Length, 1);
parameters.Add(p => p.InputType, inputType);
parameters.Add(p => p.Type, inputType);
});

string inputTypeAttribute = inputType switch
{
BitOtpInputType.Text => "text",
BitOtpInputType.Number => "number",
BitOtpInputType.Password => "password",
BitInputType.Text => "text",
BitInputType.Number => "number",
BitInputType.Password => "password",
_ => string.Empty
};

string inputModeAttribute = inputType switch
{
BitOtpInputType.Text => "text",
BitOtpInputType.Number => "numeric",
BitOtpInputType.Password => "text",
BitInputType.Text => "text",
BitInputType.Number => "numeric",
BitInputType.Password => "text",
_ => string.Empty
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public void BitTextFieldShouldTakeCorrectTypeAndVisual(bool isEnabled, bool isMu
parameters.Add(p => p.Required, required);
});

var bitTextField = component.Find(".bit-txt");
var textField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl");
var textField = component.Find(".bit-tfl-inp");

if (isEnabled)
{
Expand All @@ -37,7 +37,7 @@ public void BitTextFieldShouldTakeCorrectTypeAndVisual(bool isEnabled, bool isMu
Assert.AreEqual(isMultiline ? "TEXTAREA" : "INPUT", textField.TagName);

Assert.AreEqual(required, textField.HasAttribute("required"));
Assert.AreEqual(required, bitTextField.ClassList.Contains("bit-txt-req"));
Assert.AreEqual(required, bitTextField.ClassList.Contains("bit-tfl-req"));
}

[DataTestMethod,
Expand All @@ -52,7 +52,7 @@ public void BitTextFieldShouldTakeValue(bool isMultiline, string value)
parameters.Add(p => p.IsMultiline, isMultiline);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");

Assert.AreEqual(bitTextField.GetAttribute("value"), value);
}
Expand All @@ -65,7 +65,7 @@ public void BitTextFieldLabel(string label)
parameters.Add(p => p.Label, label);
});

var bitTextFieldLabel = com.Find(".bit-txt-lbl").TextContent;
var bitTextFieldLabel = com.Find(".bit-tfl-lbl").TextContent;

Assert.AreEqual(label, bitTextFieldLabel);
}
Expand All @@ -86,7 +86,7 @@ public void BitTextFieldShouldTakeBaseParameters(int maxLength, bool isMultiline
parameters.Add(p => p.ReadOnly, readOnly);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");

Assert.IsTrue(bitTextField.HasAttribute("maxlength"));
Assert.AreEqual(bitTextField.GetAttribute("maxlength"), maxLength.ToString());
Expand All @@ -105,7 +105,7 @@ public void BitTextFieldShouldAcceptIcon(string iconName)
parameters.Add(p => p.IconName, iconName);
});

var bitTextFieldIcon = component.Find(".bit-txt-inp + .bit-icon");
var bitTextFieldIcon = component.Find(".bit-tfl-inp + .bit-icon");

Assert.IsTrue(bitTextFieldIcon.ClassList.Contains($"bit-icon--{iconName}"));
}
Expand All @@ -119,13 +119,13 @@ public void BitTextFieldCanRevealPassword(bool isEnabled)
var component = RenderComponent<BitTextField>(parameters =>
{
parameters.Add(p => p.IsEnabled, isEnabled);
parameters.Add(p => p.Type, BitTextFieldType.Password);
parameters.Add(p => p.Type, BitInputType.Password);
parameters.Add(p => p.CanRevealPassword, true);
});

var textField = component.Find(".bit-txt-inp");
var revealPasswordBtn = component.Find(".bit-txt-prb");
var revealPasswordIcon = component.Find(".bit-txt-prb > span > i");
var textField = component.Find(".bit-tfl-inp");
var revealPasswordBtn = component.Find(".bit-tfl-prb");
var revealPasswordIcon = component.Find(".bit-tfl-prb > span > i");

Assert.AreEqual("password", textField.GetAttribute("type"));
Assert.IsTrue(revealPasswordIcon.ClassList.Contains($"bit-icon--View"));
Expand All @@ -137,18 +137,18 @@ public void BitTextFieldCanRevealPassword(bool isEnabled)
}

[DataTestMethod,
DataRow(BitTextFieldType.Password),
DataRow(BitTextFieldType.Number),
DataRow(BitTextFieldType.Tel)
DataRow(BitInputType.Password),
DataRow(BitInputType.Number),
DataRow(BitInputType.Tel)
]
public void BitTextFieldTypeTest(BitTextFieldType type)
public void BitInputTypeTest(BitInputType type)
{
var component = RenderComponent<BitTextField>(parameters =>
{
parameters.Add(p => p.Type, type);
});

var textField = component.Find(".bit-txt-inp");
var textField = component.Find(".bit-tfl-inp");

Assert.AreEqual(type.GetDisplayName(toLowerDisplayName: true), textField.GetAttribute("type"));
}
Expand All @@ -169,7 +169,7 @@ public void BitTextFieldMustRespondToTheClickEvent(bool isEnabled, bool isMultil
parameters.Add(p => p.OnClick, () => currentCount++);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");

bitTextField.Click();

Expand All @@ -196,7 +196,7 @@ public void BitTextFieldMustRespondToTheFocusEvent(bool isEnabled, bool isMultil
parameters.Add(p => p.OnFocusOut, () => focusedOutValue++);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");

bitTextField.Focus();
Assert.AreEqual(isEnabled ? 1 : 0, focusedValue);
Expand Down Expand Up @@ -226,7 +226,7 @@ public void BitTextFieldMustRespondToTheKeyEvent(bool isEnabled, bool isMultilin
parameters.Add(p => p.OnKeyDown, (KeyboardEventArgs e) => keyDownedValue = e.Key);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");

bitTextField.KeyUp(keyUpValue);
Assert.AreEqual(isEnabled ? keyUpValue : null, keyUppedValue);
Expand All @@ -251,7 +251,7 @@ public void BitTextFieldMustRespondToTheChangeEvent(bool isEnabled, bool isMulti
parameters.Add(p => p.OnChange, () => currentCount++);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");

bitTextField.Change("a");

Expand All @@ -266,7 +266,7 @@ public void BitTextFieldShowPrefix(string prefix)
parameters.Add(p => p.Prefix, prefix);
});

var bitTextFieldPrefix = component.Find(".bit-txt-pre > span");
var bitTextFieldPrefix = component.Find(".bit-tfl-pre > span");
Assert.AreEqual(prefix, bitTextFieldPrefix.TextContent);
}

Expand All @@ -278,7 +278,7 @@ public void BitTextFieldShowSuffix(string suffix)
parameters.Add(p => p.Suffix, suffix);
});

var bitTextFieldSuffix = component.Find(".bit-txt-suf > span");
var bitTextFieldSuffix = component.Find(".bit-tfl-suf > span");
Assert.AreEqual(suffix, bitTextFieldSuffix.TextContent);
}

Expand All @@ -294,7 +294,7 @@ public void BitTextFieldShouldTakeDefaultValue(bool isMultiline, string defaultV
parameters.Add(p => p.IsMultiline, isMultiline);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");

Assert.AreEqual(defaultValue, bitTextField.GetAttribute("value"));
}
Expand All @@ -307,7 +307,7 @@ public void BitTextFieldShouldTakeDescription(string description)
parameters.Add(p => p.Description, description);
});

var bitTextFieldDescription = component.Find(".bit-txt-des > span");
var bitTextFieldDescription = component.Find(".bit-tfl-des > span");
Assert.AreEqual(description, bitTextFieldDescription.TextContent);
}

Expand All @@ -322,8 +322,8 @@ public void BitTextFieldShouldRespectUnderLineStyle(bool isUnderlined)
parameters.Add(p => p.IsUnderlined, isUnderlined);
});

var bitTextField = component.Find(".bit-txt");
Assert.AreEqual(isUnderlined, bitTextField.ClassList.Contains("bit-txt-und"));
var bitTextField = component.Find(".bit-tfl");
Assert.AreEqual(isUnderlined, bitTextField.ClassList.Contains("bit-tfl-und"));
}

[DataTestMethod,
Expand All @@ -337,8 +337,8 @@ public void BitTextFieldShouldRespectHasBorderStyle(bool hasBorder)
parameters.Add(p => p.HasBorder, hasBorder);
});

var bitTextField = component.Find(".bit-txt");
Assert.AreEqual(hasBorder is false, bitTextField.ClassList.Contains("bit-txt-nbd"));
var bitTextField = component.Find(".bit-tfl");
Assert.AreEqual(hasBorder is false, bitTextField.ClassList.Contains("bit-tfl-nbd"));
}

[DataTestMethod, DataRow(5)]
Expand All @@ -350,7 +350,7 @@ public void BitTextFieldShouldRespectRowsNumberWhenItIsMultiline(int rows)
parameters.Add(p => p.Rows, rows);
});

var input = component.Find(".bit-txt textarea");
var input = component.Find(".bit-tfl textarea");
Assert.AreEqual(rows.ToString(), input.GetAttribute("rows"));
}

Expand All @@ -366,8 +366,8 @@ public void BitTextFieldShouldRespectIsResizableWhenItIsMultiline(bool isResizab
parameters.Add(p => p.IsResizable, isResizable);
});

var bitTextField = component.Find(".bit-txt");
Assert.AreEqual(!isResizable, bitTextField.ClassList.Contains("bit-txt-mlf"));
var bitTextField = component.Find(".bit-tfl");
Assert.AreEqual(!isResizable, bitTextField.ClassList.Contains("bit-tfl-mlf"));
}

[DataTestMethod,
Expand All @@ -383,7 +383,7 @@ public void BitTextFieldAriaLabelTest(string ariaLabel, bool isMultiline)
});


var input = component.Find(".bit-txt-inp");
var input = component.Find(".bit-tfl-inp");

Assert.IsTrue(input.HasAttribute("aria-label"));
Assert.AreEqual(input.GetAttribute("aria-label"), ariaLabel);
Expand All @@ -403,7 +403,7 @@ public void BitTextFieldAriaLabelledbyTest(bool isMultiline, string label)
parameters.Add(p => p.IsMultiline, isMultiline);
});

var input = component.Find(".bit-txt-inp");
var input = component.Find(".bit-tfl-inp");
Assert.AreEqual(label.HasValue(), input.HasAttribute("aria-labelledby"));
}

Expand All @@ -420,7 +420,7 @@ public void BitTextFieldAutoCompleteTest(string autoComplete)
parameters.Add(p => p.AutoComplete, autoComplete);
});

var input = component.Find(".bit-txt-inp");
var input = component.Find(".bit-tfl-inp");

if (autoComplete.HasValue())
{
Expand Down Expand Up @@ -607,7 +607,7 @@ public void BitTextFieldValidationInvalidCssClassTest(string value)

var isInvalid = value != "[email protected]";

var bitTextField = component.Find(".bit-txt");
var bitTextField = component.Find(".bit-tfl");

Assert.IsFalse(bitTextField.ClassList.Contains("bit-inv"));

Expand Down Expand Up @@ -644,7 +644,7 @@ public void BitTextFieldTrimmedDefaultValueTest(string value)
parameters.Add(p => p.DefaultValue, value);
});

var bitTextField = component.Find(".bit-txt-inp");
var bitTextField = component.Find(".bit-tfl-inp");
var trimmedValue = bitTextField.GetAttribute("value");

Assert.AreEqual(value.Trim(), trimmedValue);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
[Parameter] public string Placeholder { get; set; }
[Parameter] public bool CanRevealPassword { get; set; }
[Parameter] public string RevealPasswordAriaLabel { get; set; }
[Parameter] public BitTextFieldType Type { get; set; }
[Parameter] public BitInputType Type { get; set; }
[Parameter] public string AriaLabel { get; set; }
[Parameter] public string Label { get; set; }
[Parameter] public string Prefix { get; set; }
Expand Down
Loading

0 comments on commit fb67c22

Please sign in to comment.