Many years ago I studied cognitive and social science, but then went on to work in another field. Recently I revisited the current scientific literature and rethought my understanding of psychology. Cognitive sciences are beginning to be understood within a much broader interdisciplinary framework.
Until recently cognition and affect were treated as two very different aspects of psychology.
From the wikipedia: "...starting with Thomas Aquinas, who divided the study of behavior into two broad categories: cognitive (how we know the world), and affective (feelings and emotions). Consequently, this description tends to apply to processes such as memory, association, concept formation, pattern recognition, language, attention, perception, action, problem solving and mental imagery.Traditionally, emotion was not thought of as a cognitive process."
And that dual nature has continued strongly, until recently, because of the popularitiy of an information processing view of the mind. That issue led me to the first note below where I question this concept. And the issue eventually leads to an idea known as embodied cognition, a much more modern view of things.
For more, see interdisciplinary ideas from cognitive sciences, evolutionary psychology, ethology, systems sciences