From d3cdd7ef8a4aa0eb4246ebc184333eba4618684c Mon Sep 17 00:00:00 2001 From: CaptainWelpe Date: Tue, 17 Oct 2023 11:09:13 +0200 Subject: [PATCH 1/5] - ignore something local --- .gitignore | 364 ------------------ ...it.WinUI.Controls.TokenizingTextBox.csproj | 30 -- 2 files changed, 394 deletions(-) delete mode 100644 .gitignore delete mode 100644 components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b4d83854..00000000 --- a/.gitignore +++ /dev/null @@ -1,364 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ -*.g.cs - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -**/nuget.exe -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# JetBrains Rider files -.idea/ - -# Community Toolkit Labs generated files -CommunityToolkit.AllComponents.sln -tooling/MultiTarget/Generated/** -heads/ - -# We use slngen to generate solutions -*.sln diff --git a/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj b/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj deleted file mode 100644 index afb4148f..00000000 --- a/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - TokenizingTextBox - This package contains TokenizingTextBox. - - - CommunityToolkit.WinUI.Controls.TokenizingTextBoxRns - ReadMe.md - - - - - - - - - - - - - - True - \ - - - - - $(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName) - - From aa36a45ba54b303f2fe7b38d7f55da268ee14085 Mon Sep 17 00:00:00 2001 From: CaptainWelpe Date: Tue, 17 Oct 2023 11:10:41 +0200 Subject: [PATCH 2/5] fix TokenizingTextBoxItem does only check for single character TokenDelimiter https://github.com/CommunityToolkit/Windows/issues/257 --- .../src/TokenizingTextBoxItem.AutoSuggestBox.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs b/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs index 305d91cc..812ab251 100644 --- a/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs +++ b/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs @@ -213,7 +213,7 @@ private void AutoSuggestBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTex // Look for Token Delimiters to create new tokens when text changes. if (!string.IsNullOrEmpty(Owner.TokenDelimiter) && t.Contains(Owner.TokenDelimiter)) { - bool lastDelimited = t[t.Length - 1] == Owner.TokenDelimiter[0]; + bool lastDelimited = t.EndsWith(Owner.TokenDelimiter); #if HAS_UNO string[] tokens = t.Split(new[] { Owner.TokenDelimiter }, System.StringSplitOptions.RemoveEmptyEntries); From b3190d7c9272c2c156c4ff2a42cc602b84246dc0 Mon Sep 17 00:00:00 2001 From: CaptainWelpe Date: Tue, 17 Oct 2023 11:20:21 +0200 Subject: [PATCH 3/5] enhance TokenizingTextBox by giving access to the IsSuggestionListOpen property of the AutoSuggestBox https://github.com/CommunityToolkit/Windows/issues/256 --- .../TokenizingTextBox/src/TokenizingTextBox.cs | 18 +++++++++++++++++- .../TokenizingTextBoxItem.AutoSuggestBox.cs | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/components/TokenizingTextBox/src/TokenizingTextBox.cs b/components/TokenizingTextBox/src/TokenizingTextBox.cs index d3972b4e..ae0745f5 100644 --- a/components/TokenizingTextBox/src/TokenizingTextBox.cs +++ b/components/TokenizingTextBox/src/TokenizingTextBox.cs @@ -38,7 +38,23 @@ public partial class TokenizingTextBox : ListViewBase internal const string PART_PointerOverState = "PointerOver"; internal const string PART_FocusedState = "Focused"; internal const string PART_UnfocusedState = "Unfocused"; - internal const string PART_MaxReachedState = "MaxReachedState"; + internal const string PART_MaxReachedState = "MaxReachedState"; + + /// + /// Access to the AutoSuggestBox IsSuggestionListOpen property + /// + /// + public bool IsSuggestionListOpen + { + get => (ContainerFromItem(_lastTextEdit) is TokenizingTextBoxItem lastContainer) ? lastContainer.IsSuggestionListOpen : false; + set + { + if (ContainerFromItem(_lastTextEdit) is TokenizingTextBoxItem lastContainer) + { + lastContainer.IsSuggestionListOpen = value; + } + } + } /// /// Gets a value indicating whether the shift key is currently in a pressed state diff --git a/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs b/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs index 812ab251..a54ade5d 100644 --- a/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs +++ b/components/TokenizingTextBox/src/TokenizingTextBoxItem.AutoSuggestBox.cs @@ -50,7 +50,22 @@ public partial class TokenizingTextBoxItem /// /// Gets a value indicating whether all text in the text box is currently selected. False otherwise. /// - private bool IsAllSelected => _autoSuggestTextBox?.SelectedText == _autoSuggestTextBox?.Text && !string.IsNullOrEmpty(_autoSuggestTextBox?.Text); + private bool IsAllSelected => _autoSuggestTextBox?.SelectedText == _autoSuggestTextBox?.Text && !string.IsNullOrEmpty(_autoSuggestTextBox?.Text); + + /// + /// Give the TokenizingTextBox access to the AutoSuggestBox IsSuggestionListOpen property + /// + internal bool IsSuggestionListOpen + { + get => (_autoSuggestBox != null) ? _autoSuggestBox.IsSuggestionListOpen : false; + set + { + if (_autoSuggestBox != null) + { + _autoSuggestBox.IsSuggestionListOpen = value; + } + } + } /// /// Used to track if we're on the first character of the textbox while there is selected text From c63ab7fdea17ca031858f514629244e4cd560d38 Mon Sep 17 00:00:00 2001 From: CaptainWelpe Date: Tue, 17 Oct 2023 11:22:44 +0200 Subject: [PATCH 4/5] enhance TokenizingTextBox by adding a GetIsAutoSuggestTextBoxFocused() method https://github.com/CommunityToolkit/Windows/issues/259 --- components/TokenizingTextBox/src/TokenizingTextBox.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/TokenizingTextBox/src/TokenizingTextBox.cs b/components/TokenizingTextBox/src/TokenizingTextBox.cs index ae0745f5..fd37d605 100644 --- a/components/TokenizingTextBox/src/TokenizingTextBox.cs +++ b/components/TokenizingTextBox/src/TokenizingTextBox.cs @@ -180,6 +180,14 @@ private void FocusPrimaryAutoSuggestBox() container.Focus(FocusState.Programmatic); } } + } + + /// + /// Get a value if focus is on the AutoSuggestBox in the collection + /// + public bool GetIsAutoSuggestTextBoxFocused() + { + return !(GetFocusedElement() is TokenizingTextBoxItem); } private async void TokenizingTextBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e) From 335d2325712acd26caf32168d99fb1b23e0dd436 Mon Sep 17 00:00:00 2001 From: CaptainWelpe Date: Tue, 17 Oct 2023 13:20:28 +0200 Subject: [PATCH 5/5] fix TokenizingTextBox does not unselect all Tokens on LostFocus https://github.com/CommunityToolkit/Windows/issues/258 --- components/TokenizingTextBox/src/TokenizingTextBox.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/TokenizingTextBox/src/TokenizingTextBox.cs b/components/TokenizingTextBox/src/TokenizingTextBox.cs index fd37d605..1c097a06 100644 --- a/components/TokenizingTextBox/src/TokenizingTextBox.cs +++ b/components/TokenizingTextBox/src/TokenizingTextBox.cs @@ -476,7 +476,10 @@ private void TokenizingTextBoxItem_LostFocus(object sender, RoutedEventArgs e) UpdateCurrentTextEdit(_lastTextEdit); GuardAgainstPlaceholderTextLayoutIssue(); - } + } + + // also unfocus all tokens + DeselectAllTokensAndText(); } ///