incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1403838 - in /incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components: ComboBox.as supportClasses/ListBase.as
Date Tue, 30 Oct 2012 19:34:39 GMT
Author: cframpton
Date: Tue Oct 30 19:34:38 2012
New Revision: 1403838

URL: http://svn.apache.org/viewvc?rev=1403838&view=rev
Log:
If the ComboBox selectedItem is set to null or undefined, the label display should be cleared.
If the text in the ComboBox label is deleted, and then the mouse is used to select the same
item from the dropdown, the label should update with the selected text. [SDK-30479][SDK-30547]

Modified:
    incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/ComboBox.as
    incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/ComboBox.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/ComboBox.as?rev=1403838&r1=1403837&r2=1403838&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/ComboBox.as
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/ComboBox.as
Tue Oct 30 19:34:38 2012
@@ -29,6 +29,7 @@ import flash.events.KeyboardEvent;
 import flash.events.MouseEvent;
 import flash.ui.Keyboard;
 
+import flashx.textLayout.operations.CompositeOperation;
 import flashx.textLayout.operations.CutOperation;
 import flashx.textLayout.operations.DeleteTextOperation;
 import flashx.textLayout.operations.FlowOperation;
@@ -140,7 +141,7 @@ use namespace mx_internal;
  *  <p>The ComboBox control also searches the item list as the user 
  *  enters characters into the prompt area. As the user enters characters, 
  *  the drop-down area of the control opens. 
- *  It then and scrolls to and highlights the closest match in the item list.</p>
+ *  It then scrolls to and highlights the closest match in the item list.</p>
  *
  *  <p>To use this component in a list-based component, such as a List or DataGrid,

  *  create an item renderer.
@@ -553,6 +554,23 @@ public class ComboBox extends DropDownLi
     }
     
     //--------------------------------------------------------------------------
+    //  selectedItem
+    //--------------------------------------------------------------------------
+    
+    /**
+     *  @private
+     */
+    override public function set selectedItem(value:*):void
+    {
+        // If selectedItem set to null or undefined make sure the label display gets cleared.
+        // The code at the bottom of commitProperties checks for this case.
+        if (value == null)
+            selectedIndex = NO_SELECTION;
+        
+        super.selectedItem = value;
+    }
+
+    //--------------------------------------------------------------------------
     //  typicalItem
     //--------------------------------------------------------------------------
     
@@ -731,7 +749,7 @@ public class ComboBox extends DropDownLi
         {
             _proposedSelectedIndex = NO_PROPOSED_SELECTION;
         }
-                
+        
         super.commitProperties();
         
         if (textInput)
@@ -865,6 +883,22 @@ public class ComboBox extends DropDownLi
         return false;
     }
     
+    /**
+     * @private
+     */
+    override mx_internal function setSelectedIndex(value:int, dispatchChangeEvent:Boolean
= false, changeCaret:Boolean = true):void
+    {
+        // It is possible that the label display changed but the selection didn't.  If this
is
+        // the case, the label has to be updated since the setSelectedIndex code will short-circuit
+        // and not commit the selection.
+        // An example is if the label is deleted and then the first item is chosen from the
+        // dropdown, the selectedIndex is still 0.
+        if (userTypedIntoText && value == selectedIndex)
+            updateLabelDisplay();
+        
+        super.setSelectedIndex(value, dispatchChangeEvent, changeCaret);
+    }
+    
     // If the TextInput is in focus, listen for keyDown events in the capture phase so that

     // we can process the navigation keys (UP/DOWN, PGUP/PGDN, HOME/END). If the ComboBox
is in 
     // focus, just handle keyDown events in the bubble phase
@@ -1048,12 +1082,28 @@ public class ComboBox extends DropDownLi
         userTypedIntoText = true;
         
         var operation:FlowOperation = event.operation;
-
-        // Close the dropDown if we press delete or cut the selected text
-        if (operation is DeleteTextOperation || operation is CutOperation)
+        
+        // TLF is batching some operations so it can undo them.  If it is a composite operation
+        // look at the last one to figure out if it was a delete.
+        var deleteText:Boolean = (operation is DeleteTextOperation || operation is CutOperation);
+        if (operation is CompositeOperation)
         {
-            super.changeHighlightedSelection(CUSTOM_SELECTED_ITEM);
+            const operations:Array = CompositeOperation(operation).operations;
+            if (operations.length && operations[operations.length-1] is DeleteTextOperation)
+                deleteText = true;
         }
+        
+        // If deleting text do not want to do item completion or it isn't possible to delete
+        // individual characters.  If the combo is open, leave it open, even if all the text
+        // is deleted.
+        if (deleteText)
+        {
+            // To commit the selection correctly on close, applySelection needs this set.

+            actualProposedSelectedIndex = CUSTOM_SELECTED_ITEM; 
+            
+            // Update the selected item in the list.
+            super.changeHighlightedSelection(CUSTOM_SELECTED_ITEM);
+        }        
         else if (previousTextInputText != textInput.text)
         {
             if (openOnInput)
@@ -1068,7 +1118,7 @@ public class ComboBox extends DropDownLi
             }
             
             processInputField();
-        }
+        }  
     }
     
     /**

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as?rev=1403838&r1=1403837&r2=1403838&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
Tue Oct 30 19:34:38 2012
@@ -934,7 +934,7 @@ public class ListBase extends SkinnableD
             else
                 _proposedSelectedIndex = NO_SELECTION;
             
-            if (allowCustomSelectedItem && _proposedSelectedIndex == -1)
+            if (allowCustomSelectedItem && _proposedSelectedIndex == -1 &&
_pendingSelectedItem != null)
             {
                 _proposedSelectedIndex = CUSTOM_SELECTED_ITEM;
                 _selectedItem = _pendingSelectedItem;



Mime
View raw message